Adding output parameter to PageHistoryBeforeList hook

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

diff --git a/includes/CategoryViewer.php b/includes/CategoryViewer.php
index 7678ffe..f9020b7 100644 (file)
--- a/includes/CategoryViewer.php
+++ b/includes/CategoryViewer.php
@@ -71,9 +71,9 @@ class CategoryViewer extends ContextSource {
         * @since 1.19 $context is a second, required parameter
         * @param $title Title
         * @param $context IContextSource
-        * @param $from Array An array with keys page, subcat,
+        * @param array $from An array with keys page, subcat,
         *        and file for offset of results of each section (since 1.17)
-        * @param $until Array An array with 3 keys for until of each section (since 1.17)
+        * @param array $until An array with 3 keys for until of each section (since 1.17)
         * @param $query Array
         */
        function __construct( $title, IContextSource $context, $from = array(), $until = array(), $query = array() ) {
@@ -288,10 +288,10 @@ class CategoryViewer extends ContextSource {
                        # the collation in the database differs from the one
                        # set in $wgCategoryCollation, pagination might go totally haywire.
                        $extraConds = array( 'cl_type' => $type );
-                       if ( $this->from[$type] !== null ) {
+                       if ( isset( $this->from[$type] ) && $this->from[$type] !== null ) {
                                $extraConds[] = 'cl_sortkey >= '
                                        . $dbr->addQuotes( $this->collation->getSortKey( $this->from[$type] ) );
-                       } elseif ( $this->until[$type] !== null ) {
+                       } elseif ( isset( $this->until[$type] ) && $this->until[$type] !== null ) {
                                $extraConds[] = 'cl_sortkey < '
                                        . $dbr->addQuotes( $this->collation->getSortKey( $this->until[$type] ) );
                                $this->flip[$type] = true;
@@ -441,13 +441,13 @@ class CategoryViewer extends ContextSource {
         * Get the paging links for a section (subcats/pages/files), to go at the top and bottom
         * of the output.
         *
-        * @param $type String: 'page', 'subcat', or 'file'
+        * @param string $type 'page', 'subcat', or 'file'
         * @return String: HTML output, possibly empty if there are no other pages
         */
        private function getSectionPagingLinks( $type ) {
-               if ( $this->until[$type] !== null ) {
+               if ( isset( $this->until[$type] ) && $this->until[$type] !== null ) {
                        return $this->pagingLinks( $this->nextPage[$type], $this->until[$type], $type );
-               } elseif ( $this->nextPage[$type] !== null || $this->from[$type] !== null ) {
+               } elseif ( $this->nextPage[$type] !== null || ( isset( $this->from[$type] ) && $this->from[$type] !== null ) ) {
                        return $this->pagingLinks( $this->from[$type], $this->nextPage[$type], $type );
                } else {
                        return '';
@@ -573,9 +573,9 @@ class CategoryViewer extends ContextSource {
        /**
         * Create paging links, as a helper method to getSectionPagingLinks().
         *
-        * @param $first String The 'until' parameter for the generated URL
-        * @param $last String The 'from' parameter for the genererated URL
-        * @param $type String A prefix for parameters, 'page' or 'subcat' or
+        * @param string $first The 'until' parameter for the generated URL
+        * @param string $last The 'from' parameter for the genererated URL
+        * @param string $type A prefix for parameters, 'page' or 'subcat' or
         *     'file'
         * @return String HTML
         */
@@ -616,7 +616,7 @@ class CategoryViewer extends ContextSource {
         * corresponds to the correct segment of the category.
         *
         * @param Title $title: The title (usually $this->title)
-        * @param String $section: Which section
+        * @param string $section: Which section
         * @throws MWException
         * @return Title
         */
@@ -650,9 +650,9 @@ class CategoryViewer extends ContextSource {
         * category-subcat-count-limited, category-file-count,
         * category-file-count-limited.
         *
-        * @param $rescnt Int: The number of items returned by our database query.
-        * @param $dbcnt Int: The number of items according to the category table.
-        * @param $type String: 'subcat', 'article', or 'file'
+        * @param int $rescnt The number of items returned by our database query.
+        * @param int $dbcnt The number of items according to the category table.
+        * @param string $type 'subcat', 'article', or 'file'
         * @return String: A message giving the number of items, to output to HTML.
         */
        private function getCountMessage( $rescnt, $dbcnt, $type ) {
@@ -677,7 +677,9 @@ class CategoryViewer extends ContextSource {
                }
 
                $fromOrUntil = false;
-               if ( $this->from[$pagingType] !== null || $this->until[$pagingType] !== null ) {
+               if ( ( isset( $this->from[$pagingType] ) && $this->from[$pagingType] !== null ) ||
+                       ( isset( $this->until[$pagingType] ) && $this->until[$pagingType] !== null )
+               ) {
                        $fromOrUntil = true;
                }