Merge "Http::getProxy() method to get proxy configuration"

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

diff --git a/includes/page/CategoryPage.php b/includes/page/CategoryPage.php
index 2edf1af..55fe156 100644 (file)
--- a/includes/page/CategoryPage.php
+++ b/includes/page/CategoryPage.php
@@ -29,6 +29,11 @@ class CategoryPage extends Article {
        # Subclasses can change this to override the viewer class.
        protected $mCategoryViewerClass = 'CategoryViewer';
 
+       /**
+        * @var WikiCategoryPage
+        */
+       protected $mPage;
+
        /**
         * @param Title $title
         * @return WikiCategoryPage
@@ -61,7 +66,7 @@ class CategoryPage extends Article {
                        return;
                }
 
-               if ( !Hooks::run( 'CategoryPageView', array( &$this ) ) ) {
+               if ( !Hooks::run( 'CategoryPageView', [ &$this ] ) ) {
                        return;
                }
 
@@ -89,8 +94,8 @@ class CategoryPage extends Article {
 
                $reqArray = $request->getValues();
 
-               $from = $until = array();
-               foreach ( array( 'page', 'subcat', 'file' ) as $type ) {
+               $from = $until = [];
+               foreach ( [ 'page', 'subcat', 'file' ] as $type ) {
                        $from[$type] = $request->getVal( "{$type}from", $oldFrom );
                        $until[$type] = $request->getVal( "{$type}until", $oldUntil );
 
@@ -115,6 +120,6 @@ class CategoryPage extends Article {
                );
                $out = $this->getContext()->getOutput();
                $out->addHTML( $viewer->getHTML() );
-               $out->addHelpLink( 'Help:Categories' );
+               $this->addHelpLink( 'Help:Categories' );
        }
 }