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 "Allow putting the app ID in the password for bot passwords"
[lhc/web/wiklou.git]
/
includes
/
resourceloader
/
ResourceLoaderContext.php
diff --git
a/includes/resourceloader/ResourceLoaderContext.php
b/includes/resourceloader/ResourceLoaderContext.php
index
85fc53d
..
30fe3ae
100644
(file)
--- a/
includes/resourceloader/ResourceLoaderContext.php
+++ b/
includes/resourceloader/ResourceLoaderContext.php
@@
-91,8
+91,8
@@
class ResourceLoaderContext {
/**
* Expand a string of the form jquery.foo,bar|jquery.ui.baz,quux to
/**
* Expand a string of the form jquery.foo,bar|jquery.ui.baz,quux to
- * an array of module names like
array(
'jquery.foo', 'jquery.bar',
- * 'jquery.ui.baz', 'jquery.ui.quux'
)
+ * an array of module names like
[
'jquery.foo', 'jquery.bar',
+ * 'jquery.ui.baz', 'jquery.ui.quux'
]
* @param string $modules Packed module name list
* @return array Array of module names
*/
* @param string $modules Packed module name list
* @return array Array of module names
*/
@@
-113,7
+113,7
@@
class ResourceLoaderContext {
} else {
// We have a prefix and a bunch of suffixes
$prefix = substr( $group, 0, $pos ); // 'foo'
} else {
// We have a prefix and a bunch of suffixes
$prefix = substr( $group, 0, $pos ); // 'foo'
- $suffixes = explode( ',', substr( $group, $pos + 1 ) ); //
array( 'bar', 'baz' )
+ $suffixes = explode( ',', substr( $group, $pos + 1 ) ); //
[ 'bar', 'baz' ]
foreach ( $suffixes as $suffix ) {
$retval[] = "$prefix.$suffix";
}
foreach ( $suffixes as $suffix ) {
$retval[] = "$prefix.$suffix";
}
@@
-175,8
+175,7
@@
class ResourceLoaderContext {
// Stricter version of RequestContext::sanitizeLangCode()
if ( !Language::isValidBuiltInCode( $lang ) ) {
wfDebug( "Invalid user language code\n" );
// Stricter version of RequestContext::sanitizeLangCode()
if ( !Language::isValidBuiltInCode( $lang ) ) {
wfDebug( "Invalid user language code\n" );
- global $wgLanguageCode;
- $lang = $wgLanguageCode;
+ $lang = $this->getResourceLoader()->getConfig()->get( 'LanguageCode' );
}
$this->language = $lang;
}
}
$this->language = $lang;
}
@@
-260,7
+259,7
@@
class ResourceLoaderContext {
/**
* @see ResourceLoaderModule::getVersionHash
/**
* @see ResourceLoaderModule::getVersionHash
- * @see
OutputPage::makeResourceLoaderLink
+ * @see
ResourceLoaderClientHtml::makeLoad
* @return string|null
*/
public function getVersion() {
* @return string|null
*/
public function getVersion() {