dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "resourceloader: Move registration of Resources.php to ServiceWiring"
[lhc/web/wiklou.git]
/
includes
/
resourceloader
/
ResourceLoader.php
diff --git
a/includes/resourceloader/ResourceLoader.php
b/includes/resourceloader/ResourceLoader.php
index
b8569d4
..
02e02bb
100644
(file)
--- a/
includes/resourceloader/ResourceLoader.php
+++ b/
includes/resourceloader/ResourceLoader.php
@@
-1172,7
+1172,7
@@
MESSAGE;
*/
private function ensureNewline( $str ) {
$end = substr( $str, -1 );
*/
private function ensureNewline( $str ) {
$end = substr( $str, -1 );
- if ( $end === false || $end === "\n" ) {
+ if ( $end === false || $end ===
'' || $end ===
"\n" ) {
return $str;
}
return $str . "\n";
return $str;
}
return $str . "\n";
@@
-1444,7
+1444,7
@@
MESSAGE;
}
}
}
}
- array_walk( $modules, [
'self'
, 'trimArray' ] );
+ array_walk( $modules, [
self::class
, 'trimArray' ] );
return Xml::encodeJsCall(
'mw.loader.register',
return Xml::encodeJsCall(
'mw.loader.register',