jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/372470 )
Change subject: Check if SpecialMobileWatchlist exist
......................................................................
Check if SpecialMobileWatchlist exist
If MobileFrontend doesn't exist this will throw an error
Bug: T171241
Change-Id: Ie61cfa61b78a53598ac59aea15c8a4e6a261238d
---
M includes/skins/SkinMinerva.php
1 file changed, 10 insertions(+), 7 deletions(-)
Approvals:
jenkins-bot: Verified
Jdlrobson: Looks good to me, approved
diff --git a/includes/skins/SkinMinerva.php b/includes/skins/SkinMinerva.php
index e6d66f4..d108b48 100644
--- a/includes/skins/SkinMinerva.php
+++ b/includes/skins/SkinMinerva.php
@@ -470,13 +470,16 @@
$watchlistQuery = [];
$user = $this->getUser();
if ( $user ) {
- $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;
+ }
}
}
--
To view, visit https://gerrit.wikimedia.org/r/372470
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie61cfa61b78a53598ac59aea15c8a4e6a261238d
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/skins/MinervaNeue
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson <[email protected]>
Gerrit-Reviewer: Jdlrobson <[email protected]>
Gerrit-Reviewer: Pmiazga <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
