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 "Change 'rights' to 'groups' on MediaWiki:Savedrights"
[lhc/web/wiklou.git]
/
includes
/
specialpage
/
SpecialPageFactory.php
diff --git
a/includes/specialpage/SpecialPageFactory.php
b/includes/specialpage/SpecialPageFactory.php
index
030a903
..
daabded
100644
(file)
--- a/
includes/specialpage/SpecialPageFactory.php
+++ b/
includes/specialpage/SpecialPageFactory.php
@@
-188,7
+188,6
@@
class SpecialPageFactory {
private static $list;
private static $aliases;
private static $list;
private static $aliases;
- private static $pageObjectCache = [];
/**
* Reset the internal list of special pages. Useful when changing $wgSpecialPages after
/**
* Reset the internal list of special pages. Useful when changing $wgSpecialPages after
@@
-197,7
+196,6
@@
class SpecialPageFactory {
public static function resetList() {
self::$list = null;
self::$aliases = null;
public static function resetList() {
self::$list = null;
self::$aliases = null;
- self::$pageObjectCache = [];
}
/**
}
/**
@@
-379,10
+377,6
@@
class SpecialPageFactory {
public static function getPage( $name ) {
list( $realName, /*...*/ ) = self::resolveAlias( $name );
public static function getPage( $name ) {
list( $realName, /*...*/ ) = self::resolveAlias( $name );
- if ( isset( self::$pageObjectCache[$realName] ) ) {
- return self::$pageObjectCache[$realName];
- }
-
$specialPageList = self::getPageList();
if ( isset( $specialPageList[$realName] ) ) {
$specialPageList = self::getPageList();
if ( isset( $specialPageList[$realName] ) ) {
@@
-410,7
+404,6
@@
class SpecialPageFactory {
$page = null;
}
$page = null;
}
- self::$pageObjectCache[$realName] = $page;
if ( $page instanceof SpecialPage ) {
return $page;
} else {
if ( $page instanceof SpecialPage ) {
return $page;
} else {
@@
-699,6
+692,8
@@
class SpecialPageFactory {
}
if ( $subpage !== false && !is_null( $subpage ) ) {
}
if ( $subpage !== false && !is_null( $subpage ) ) {
+ // Make sure it's in dbkey form
+ $subpage = str_replace( ' ', '_', $subpage );
$name = "$name/$subpage";
}
$name = "$name/$subpage";
}