From 892adf0ea7a7ef74c8b2c2037689d283803f2407 Mon Sep 17 00:00:00 2001 From: Kunal Mehta Date: Sun, 15 Apr 2018 16:55:25 -0700 Subject: [PATCH] getUser() will always return a User object Change-Id: Ic729992db4db459044a239ec34d95e56b013841d --- includes/skins/SkinMinerva.php | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/includes/skins/SkinMinerva.php b/includes/skins/SkinMinerva.php index 24e0bb4..031d524 100644 --- a/includes/skins/SkinMinerva.php +++ b/includes/skins/SkinMinerva.php @@ -498,17 +498,15 @@ class SkinMinerva extends SkinTemplate implements ICustomizableSkin { // Watchlist link $watchlistQuery = []; $user = $this->getUser(); - if ( $user ) { - // Avoid fatal when MobileFrontend not available (T171241) - if ( class_exists( 'SpecialMobileWatchlist' ) ) { - $view = $user->getOption( SpecialMobileWatchlist::VIEW_OPTION_NAME, false ); - $filter = $user->getOption( SpecialMobileWatchlist::FILTER_OPTION_NAME, false ); - if ( $view ) { - $watchlistQuery['watchlistview'] = $view; - } - if ( $filter && $view === 'feed' ) { - $watchlistQuery['filter'] = $filter; - } + // Avoid fatal when MobileFrontend not available (T171241) + if ( class_exists( 'SpecialMobileWatchlist' ) ) { + $view = $user->getOption( SpecialMobileWatchlist::VIEW_OPTION_NAME, false ); + $filter = $user->getOption( SpecialMobileWatchlist::FILTER_OPTION_NAME, false ); + if ( $view ) { + $watchlistQuery['watchlistview'] = $view; + } + if ( $filter && $view === 'feed' ) { + $watchlistQuery['filter'] = $filter; } }