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 "Force $wgCategoryCollation to be uppercase in tests"
[lhc/web/wiklou.git]
/
includes
/
WikiFilePage.php
diff --git
a/includes/WikiFilePage.php
b/includes/WikiFilePage.php
index
9fb1522
..
fa23072
100644
(file)
--- a/
includes/WikiFilePage.php
+++ b/
includes/WikiFilePage.php
@@
-41,7
+41,9
@@
class WikiFilePage extends WikiPage {
}
public function getActionOverrides() {
}
public function getActionOverrides() {
- return array( 'revert' => 'RevertFileAction' );
+ $overrides = parent::getActionOverrides();
+ $overrides['revert'] = 'RevertFileAction';
+ return $overrides;
}
/**
}
/**
@@
-103,13
+105,12
@@
class WikiFilePage extends WikiPage {
}
/**
}
/**
- * @param bool $text
* @return bool
*/
* @return bool
*/
- public function isRedirect(
$text = false
) {
+ public function isRedirect( ) {
$this->loadFile();
if ( $this->mFile->isLocal() ) {
$this->loadFile();
if ( $this->mFile->isLocal() ) {
- return parent::isRedirect(
$text
);
+ return parent::isRedirect();
}
return (bool)$this->mFile->getRedirected();
}
return (bool)$this->mFile->getRedirected();