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 "registration: Avoid redundant LBYL check in ExtensionRegistry::queue()"
[lhc/web/wiklou.git]
/
includes
/
registration
/
ExtensionProcessor.php
diff --git
a/includes/registration/ExtensionProcessor.php
b/includes/registration/ExtensionProcessor.php
index
faaaece
..
6182d5f
100644
(file)
--- a/
includes/registration/ExtensionProcessor.php
+++ b/
includes/registration/ExtensionProcessor.php
@@
-65,6
+65,7
@@
class ExtensionProcessor implements Processor {
protected static $coreAttributes = [
'SkinOOUIThemes',
'TrackingCategories',
protected static $coreAttributes = [
'SkinOOUIThemes',
'TrackingCategories',
+ 'RestRoutes',
];
/**
];
/**
@@
-119,6
+120,7
@@
class ExtensionProcessor implements Processor {
'ResourceFileModulePaths',
'ResourceModules',
'ResourceModuleSkinStyles',
'ResourceFileModulePaths',
'ResourceModules',
'ResourceModuleSkinStyles',
+ 'OOUIThemePaths',
'QUnitTestModule',
'ExtensionMessagesFiles',
'MessagesDirs',
'QUnitTestModule',
'ExtensionMessagesFiles',
'MessagesDirs',
@@
-444,7
+446,7
@@
class ExtensionProcessor implements Processor {
}
}
}
}
- foreach ( [ 'ResourceModules', 'ResourceModuleSkinStyles' ] as $setting ) {
+ foreach ( [ 'ResourceModules', 'ResourceModuleSkinStyles'
, 'OOUIThemePaths'
] as $setting ) {
if ( isset( $info[$setting] ) ) {
foreach ( $info[$setting] as $name => $data ) {
if ( isset( $data['localBasePath'] ) ) {
if ( isset( $info[$setting] ) ) {
foreach ( $info[$setting] as $name => $data ) {
if ( isset( $data['localBasePath'] ) ) {
@@
-458,7
+460,11
@@
class ExtensionProcessor implements Processor {
if ( $defaultPaths ) {
$data += $defaultPaths;
}
if ( $defaultPaths ) {
$data += $defaultPaths;
}
- $this->globals["wg$setting"][$name] = $data;
+ if ( $setting === 'OOUIThemePaths' ) {
+ $this->attributes[$setting][$name] = $data;
+ } else {
+ $this->globals["wg$setting"][$name] = $data;
+ }
}
}
}
}
}
}