From 9a62bcce17774d9aca25284c4a974072331e2203 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Tim=20D=C3=BCsterhus?= Date: Fri, 20 May 2022 15:51:17 +0200 Subject: [PATCH] Remove obsolete workaround for the 2.1 to 3.0 upgrade from RoutingCacheBuilder --- .../lib/system/cache/builder/RoutingCacheBuilder.class.php | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) 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 6070287a70..3e62a3acfa 100644 --- a/wcfsetup/install/files/lib/system/cache/builder/RoutingCacheBuilder.class.php +++ b/wcfsetup/install/files/lib/system/cache/builder/RoutingCacheBuilder.class.php @@ -2,7 +2,6 @@ namespace wcf\system\cache\builder; -use wcf\acp\page\ArticleListPage; use wcf\data\application\Application; use wcf\data\page\PageCache; use wcf\page\CmsPage; @@ -353,10 +352,7 @@ class RoutingCacheBuilder extends AbstractCacheBuilder if ($application->packageID == 1) { // handle WCF $page = PageCacheBuilder::getInstance()->getData([], 'landingPage'); - if ($page === null) { - // invalid cache data, e.g. during upgrade 2.1 -> 3.0 - $controller = ArticleListPage::class; - } elseif ($page->controller) { + if ($page->controller) { $controller = $page->controller; } else { $controller = '__WCF_CMS__' . $page->pageID; -- 2.20.1