From: Fomafix <fomafix@googlemail.com>
Date: Sun, 7 Apr 2019 10:08:17 +0000 (+0200)
Subject: resourceloader: Fix ensureNewline( '' ) support for PHP 7
X-Git-Tag: 1.34.0-rc.0~2109^2
X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/membres/fiche.php?a=commitdiff_plain;h=1f555b423f40a21c190fe54980ea3fc4bf50f230;p=lhc%2Fweb%2Fwiklou.git

resourceloader: Fix ensureNewline( '' ) support for PHP 7

substr( '', -1 ) returns '', not false, in PHP 7.

Change-Id: Ie48fe064385e70f070e3fbfe0b62198f36cccd6d
---

diff --git a/includes/resourceloader/ResourceLoader.php b/includes/resourceloader/ResourceLoader.php
index 4cf87350dd..b65a34bd00 100644
--- a/includes/resourceloader/ResourceLoader.php
+++ b/includes/resourceloader/ResourceLoader.php
@@ -1173,7 +1173,7 @@ MESSAGE;
 	 */
 	private function ensureNewline( $str ) {
 		$end = substr( $str, -1 );
-		if ( $end === false || $end === "\n" ) {
+		if ( $end === false || $end === '' || $end === "\n" ) {
 			return $str;
 		}
 		return $str . "\n";