From 681d6ce247ba0baa26b101201413d4c17f6ac811 Mon Sep 17 00:00:00 2001 From: Marcel Werk Date: Fri, 27 Mar 2020 13:33:10 +0100 Subject: [PATCH] User online lookup for the article page was using the article id instead of the content id --- .../lib/system/page/handler/ArticlePageHandler.class.php | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/wcfsetup/install/files/lib/system/page/handler/ArticlePageHandler.class.php b/wcfsetup/install/files/lib/system/page/handler/ArticlePageHandler.class.php index 79b58dd4ec..524290d92d 100644 --- a/wcfsetup/install/files/lib/system/page/handler/ArticlePageHandler.class.php +++ b/wcfsetup/install/files/lib/system/page/handler/ArticlePageHandler.class.php @@ -3,6 +3,7 @@ namespace wcf\system\page\handler; use wcf\data\article\ViewableArticleList; use wcf\data\page\Page; use wcf\data\user\online\UserOnline; +use wcf\system\cache\runtime\ViewableArticleContentRuntimeCache; use wcf\system\cache\runtime\ViewableArticleRuntimeCache; use wcf\system\WCF; @@ -75,12 +76,12 @@ class ArticlePageHandler extends AbstractLookupPageHandler implements IOnlineLoc return ''; } - $article = ViewableArticleRuntimeCache::getInstance()->getObject($user->pageObjectID); - if ($article === null || !$article->canRead()) { + $content = ViewableArticleContentRuntimeCache::getInstance()->getObject($user->pageObjectID); + if ($content === null || !$content->getArticle()->canRead()) { return ''; } - return WCF::getLanguage()->getDynamicVariable('wcf.page.onlineLocation.'.$page->identifier, ['article' => $article]); + return WCF::getLanguage()->getDynamicVariable('wcf.page.onlineLocation.'.$page->identifier, ['article' => $content->getArticle()]); } /** @@ -88,7 +89,7 @@ class ArticlePageHandler extends AbstractLookupPageHandler implements IOnlineLoc */ public function prepareOnlineLocation(/** @noinspection PhpUnusedParameterInspection */Page $page, UserOnline $user) { if ($user->pageObjectID !== null) { - ViewableArticleRuntimeCache::getInstance()->cacheObjectID($user->pageObjectID); + ViewableArticleContentRuntimeCache::getInstance()->cacheObjectID($user->pageObjectID); } } } -- 2.20.1