From: Umherirrender <umherirrender_de.wp@web.de>
Date: Wed, 28 Jun 2017 18:22:20 +0000 (+0200)
Subject: SpecialPageFactory::getPage can return null
X-Git-Tag: 1.31.0-rc.0~2839^2
X-Git-Url: https://git.cyclocoop.org/%7B%7B%20url_for%28?a=commitdiff_plain;h=76dd32f4318fd4d6ff1c776efa848bc663c02953;p=lhc%2Fweb%2Fwiklou.git

SpecialPageFactory::getPage can return null

Change-Id: I12b4969ec0c6b8d5a1d8feeda27152ba6075c4fd
---

diff --git a/includes/specialpage/SpecialPageFactory.php b/includes/specialpage/SpecialPageFactory.php
index 81e2b7ef2c..88336dd49f 100644
--- a/includes/specialpage/SpecialPageFactory.php
+++ b/includes/specialpage/SpecialPageFactory.php
@@ -459,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;
 			}
 		}
@@ -482,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 )
 			) {