From 1f555b423f40a21c190fe54980ea3fc4bf50f230 Mon Sep 17 00:00:00 2001 From: Fomafix Date: Sun, 7 Apr 2019 12:08:17 +0200 Subject: [PATCH] resourceloader: Fix ensureNewline( '' ) support for PHP 7 substr( '', -1 ) returns '', not false, in PHP 7. Change-Id: Ie48fe064385e70f070e3fbfe0b62198f36cccd6d --- includes/resourceloader/ResourceLoader.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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"; -- 2.20.1