Merge "(bug 43052) dblClickEdit/rightClickEdit: Trigger ca-edit click."

[lhc/web/wiklou.git] / includes / WikiFilePage.php

diff --git a/includes/WikiFilePage.php b/includes/WikiFilePage.php
index 8aeaa24..0114cce 100644 (file)
--- a/includes/WikiFilePage.php
+++ b/includes/WikiFilePage.php
@@ -1,4 +1,25 @@
 <?php
+/**
+ * Special handling for file pages.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
+ * @file
+ */
+
 /**
  * Special handling for file pages
  *
@@ -20,7 +41,9 @@ class WikiFilePage extends WikiPage {
        }
 
        public function getActionOverrides() {
-               return array( 'revert' => 'RevertFileAction' );
+               $overrides = parent::getActionOverrides();
+               $overrides[ 'revert' ] = 'RevertFileAction';
+               return $overrides;
        }
 
        /**
@@ -40,12 +63,9 @@ class WikiFilePage extends WikiPage {
                }
                $this->mFileLoaded = true;
 
-               $this->mFile = false;
+               $this->mFile = wfFindFile( $this->mTitle );
                if ( !$this->mFile ) {
-                       $this->mFile = wfFindFile( $this->mTitle );
-                       if ( !$this->mFile ) {
-                               $this->mFile = wfLocalFile( $this->mTitle ); // always a File
-                       }
+                       $this->mFile = wfLocalFile( $this->mTitle ); // always a File
                }
                $this->mRepo = $this->mFile->getRepo();
                return true;
@@ -85,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();
@@ -148,6 +167,7 @@ class WikiFilePage extends WikiPage {
 
        /**
         * Override handling of action=purge
+        * @return bool
         */
        public function doPurge() {
                $this->loadFile();