Merge "Convert article delete to use OOUI"

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

diff --git a/includes/specialpage/SpecialPageFactory.php b/includes/specialpage/SpecialPageFactory.php
index 84d3b08..8dcb30c 100644 (file)
--- a/includes/specialpage/SpecialPageFactory.php
+++ b/includes/specialpage/SpecialPageFactory.php
@@ -186,6 +186,7 @@ class SpecialPageFactory {
                'Revisiondelete' => 'SpecialRevisionDelete',
                'RunJobs' => 'SpecialRunJobs',
                'Specialpages' => 'SpecialSpecialpages',
+               'PageData' => 'SpecialPageData'
        ];
 
        private static $list;
@@ -233,7 +234,6 @@ class SpecialPageFactory {
                global $wgPageLanguageUseDB, $wgContentHandlerUseDB;
 
                if ( !is_array( self::$list ) ) {
-
                        self::$list = self::$coreList;
 
                        if ( !$wgDisableInternalSearch ) {
@@ -458,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;
                        }
                }
@@ -481,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 )
                        ) {