dépôts
/
lhc
/
web
/
wiklou.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
603740b
)
resourceloader: Fix ensureNewline( '' ) support for PHP 7
author
Fomafix
<fomafix@googlemail.com>
Sun, 7 Apr 2019 10:08:17 +0000
(12:08 +0200)
committer
Krinkle
<krinklemail@gmail.com>
Sun, 7 Apr 2019 16:32:54 +0000
(16:32 +0000)
substr( '', -1 ) returns '', not false, in PHP 7.
Change-Id: Ie48fe064385e70f070e3fbfe0b62198f36cccd6d
includes/resourceloader/ResourceLoader.php
patch
|
blob
|
history
diff --git
a/includes/resourceloader/ResourceLoader.php
b/includes/resourceloader/ResourceLoader.php
index
4cf8735
..
b65a34b
100644
(file)
--- 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";