From: Alexander Ebert <ebert@woltlab.com>
Date: Sun, 1 Jan 2017 11:13:28 +0000 (+0100)
Subject: Added work-around for WCF upgrade
X-Git-Tag: 3.0.0_RC_4~1
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=78a36ca248af0993d09f402baf5d1ef862681005;p=GitHub%2FWoltLab%2FWCF.git

Added work-around for WCF upgrade
---

diff --git a/wcfsetup/install/files/lib/system/cache/builder/RoutingCacheBuilder.class.php b/wcfsetup/install/files/lib/system/cache/builder/RoutingCacheBuilder.class.php
index b2e4b93eea..cfc77ef7ae 100644
--- a/wcfsetup/install/files/lib/system/cache/builder/RoutingCacheBuilder.class.php
+++ b/wcfsetup/install/files/lib/system/cache/builder/RoutingCacheBuilder.class.php
@@ -1,5 +1,6 @@
 <?php
 namespace wcf\system\cache\builder;
+use wcf\acp\page\ArticleListPage;
 use wcf\data\application\Application;
 use wcf\data\page\PageCache;
 use wcf\page\CmsPage;
@@ -238,7 +239,11 @@ class RoutingCacheBuilder extends AbstractCacheBuilder {
 			if ($application->packageID == 1) {
 				// handle WCF
 				$page = PageCacheBuilder::getInstance()->getData([], 'landingPage');
-				if ($page->controller) {
+				if ($page === null) {
+					// invalid cache data, e.g. during upgrade 2.1 -> 3.0
+					$controller = ArticleListPage::class;
+				}
+				else if ($page->controller) {
 					$controller = $page->controller;
 				}
 				else {