Merge "resourceloader: Restrict addModuleStyles() to type=styles modules"

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

diff --git a/includes/specialpage/SpecialPageFactory.php b/includes/specialpage/SpecialPageFactory.php
index ae010f6..88336dd 100644 (file)
--- a/includes/specialpage/SpecialPageFactory.php
+++ b/includes/specialpage/SpecialPageFactory.php
@@ -96,6 +96,7 @@ class SpecialPageFactory {
                'Block' => 'SpecialBlock',
                'Unblock' => 'SpecialUnblock',
                'BlockList' => 'SpecialBlockList',
+               'AutoblockList' => 'SpecialAutoblockList',
                'ChangePassword' => 'SpecialChangePassword',
                'BotPasswords' => 'SpecialBotPasswords',
                'PasswordReset' => 'SpecialPasswordReset',
@@ -185,6 +186,7 @@ class SpecialPageFactory {
                'Revisiondelete' => 'SpecialRevisionDelete',
                'RunJobs' => 'SpecialRunJobs',
                'Specialpages' => 'SpecialSpecialpages',
+               'PageData' => 'SpecialPageData'
        ];
 
        private static $list;
@@ -457,7 +459,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;
                        }
                }
@@ -480,8 +482,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 )
                        ) {
@@ -505,7 +507,7 @@ class SpecialPageFactory {
         * @param bool $including Bool output is being captured for use in {{special:whatever}}
         * @param LinkRenderer|null $linkRenderer (since 1.28)
         *
-        * @return bool
+        * @return bool|Title
         */
        public static function executePath( Title &$title, IContextSource &$context, $including = false,
                LinkRenderer $linkRenderer = null