Merge "Change 'editfont' default preference to 'monospace'"

[lhc/web/wiklou.git] / includes / specialpage / SpecialPageFactory.php

diff --git a/includes/specialpage/SpecialPageFactory.php b/includes/specialpage/SpecialPageFactory.php
index 81e2b7e..4433ddb 100644 (file)
--- a/includes/specialpage/SpecialPageFactory.php
+++ b/includes/specialpage/SpecialPageFactory.php
@@ -234,7 +234,6 @@ class SpecialPageFactory {
                global $wgPageLanguageUseDB, $wgContentHandlerUseDB;
 
                if ( !is_array( self::$list ) ) {
-
                        self::$list = self::$coreList;
 
                        if ( !$wgDisableInternalSearch ) {
@@ -459,7 +458,7 @@ class SpecialPageFactory {
                $pages = [];
                foreach ( self::getPageList() as $name => $rec ) {
                        $page = self::getPage( $name );
-                       if ( $page->isListed() && !$page->isRestricted() ) {
+                       if ( $page && $page->isListed() && !$page->isRestricted() ) {
                                $pages[$name] = $page;
                        }
                }
@@ -482,8 +481,8 @@ class SpecialPageFactory {
                }
                foreach ( self::getPageList() as $name => $rec ) {
                        $page = self::getPage( $name );
-                       if (
-                               $page->isListed()
+                       if ( $page
+                               && $page->isListed()
                                && $page->isRestricted()
                                && $page->userCanExecute( $user )
                        ) {
@@ -502,8 +501,8 @@ class SpecialPageFactory {
         * Returns a title object if the page is redirected, false if there was no such special
         * page, and true if it was successful.
         *
-        * @param Title $title
-        * @param IContextSource $context
+        * @param Title &$title
+        * @param IContextSource &$context
         * @param bool $including Bool output is being captured for use in {{special:whatever}}
         * @param LinkRenderer|null $linkRenderer (since 1.28)
         *