Merge "Add line breaks to the output of Special:Watchlist"

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

diff --git a/includes/CategoryPage.php b/includes/CategoryPage.php
index 92646af..3e69dd4 100644 (file)
--- a/includes/CategoryPage.php
+++ b/includes/CategoryPage.php
@@ -1,14 +1,26 @@
 <?php
 /**
- * Class for viewing MediaWiki category description pages.
+ * Special handling for category description pages.
  * Modelled after ImagePage.php.
  *
+ * 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
  */
 
-if ( !defined( 'MEDIAWIKI' ) )
-       die( 1 );
-
 /**
  * Special handling for category description pages, showing pages,
  * subcategories and file that belong to the category
@@ -17,11 +29,6 @@ class CategoryPage extends Article {
        # Subclasses can change this to override the viewer class.
        protected $mCategoryViewerClass = 'CategoryViewer';
 
-       /**
-        * @var Title
-        */
-       protected $mTitle;
-
        /**
         * @param $title Title
         * @return WikiCategoryPage
@@ -34,6 +41,7 @@ class CategoryPage extends Article {
        /**
         * Constructor from a page id
         * @param $id Int article ID to load
+        * @return CategoryPage|null
         */
        public static function newFromID( $id ) {
                $t = Title::newFromID( $id );
@@ -48,21 +56,23 @@ class CategoryPage extends Article {
                $diffOnly = $request->getBool( 'diffonly',
                        $this->getContext()->getUser()->getOption( 'diffonly' ) );
 
-               if ( isset( $diff ) && $diffOnly ) {
-                       return parent::view();
+               if ( $diff !== null && $diffOnly ) {
+                       parent::view();
+                       return;
                }
 
                if ( !wfRunHooks( 'CategoryPageView', array( &$this ) ) ) {
                        return;
                }
 
-               if ( NS_CATEGORY == $this->mTitle->getNamespace() ) {
+               $title = $this->getTitle();
+               if ( NS_CATEGORY == $title->getNamespace() ) {
                        $this->openShowCategory();
                }
 
                parent::view();
 
-               if ( NS_CATEGORY == $this->mTitle->getNamespace() ) {
+               if ( NS_CATEGORY == $title->getNamespace() ) {
                        $this->closeShowCategory();
                }
        }
@@ -96,7 +106,7 @@ class CategoryPage extends Article {
                unset( $reqArray["from"] );
                unset( $reqArray["to"] );
 
-               $viewer = new $this->mCategoryViewerClass( $this->mTitle, $this->getContext(), $from, $until, $reqArray );
+               $viewer = new $this->mCategoryViewerClass( $this->getContext()->getTitle(), $this->getContext(), $from, $until, $reqArray );
                $this->getContext()->getOutput()->addHTML( $viewer->getHTML() );
        }
 }