From 7df7fe17276c65e360a944a81748a74b1bd53074 Mon Sep 17 00:00:00 2001 From: vinithegit Date: Mon, 30 Oct 2017 18:00:37 +0530 Subject: [PATCH] Article: Show moveddeleted on 404s for all pages if the user has a session Add a check for user session and show movedelete message for this case as well. Bug: T178099 Change-Id: Id42f27a19e85b608a734c7fedb4e016d8cdc163e --- includes/page/Article.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/includes/page/Article.php b/includes/page/Article.php index 3767ecc141..df189af341 100644 --- a/includes/page/Article.php +++ b/includes/page/Article.php @@ -1179,7 +1179,8 @@ class Article implements Page { $cache = MediaWikiServices::getInstance()->getMainObjectStash(); $key = $cache->makeKey( 'page-recent-delete', md5( $title->getPrefixedText() ) ); $loggedIn = $this->getContext()->getUser()->isLoggedIn(); - if ( $loggedIn || $cache->get( $key ) ) { + $sessionExists = $this->getContext()->getRequest()->getSession()->isPersistent(); + if ( $loggedIn || $cache->get( $key ) || $sessionExists ) { $logTypes = [ 'delete', 'move', 'protect' ]; $dbr = wfGetDB( DB_REPLICA ); @@ -1196,7 +1197,7 @@ class Article implements Page { 'lim' => 10, 'conds' => $conds, 'showIfEmpty' => false, - 'msgKey' => [ $loggedIn + 'msgKey' => [ $loggedIn || $sessionExists ? 'moveddeleted-notice' : 'moveddeleted-notice-recent' ] -- 2.20.1