Update to MediaWiki 1.21.1

1 files changed, 5 insertions, 4 deletions

diff --git a/includes/WikiFilePage.php b/includes/WikiFilePage.php
index 9fb1522d..5e603d37 100644
--- a/includes/WikiFilePage.php
+++ b/includes/WikiFilePage.php
@@ -41,7 +41,9 @@ class WikiFilePage extends WikiPage {
 	}
 
 	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
 	 */
-	public function isRedirect( $text = false ) {
+	public function isRedirect() {
 		$this->loadFile();
 		if ( $this->mFile->isLocal() ) {
-			return parent::isRedirect( $text );
+			return parent::isRedirect();
 		}
 
 		return (bool)$this->mFile->getRedirected();