jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/345481 )
Change subject: Don't force enable banners or related pages in mobile web beta
......................................................................
Don't force enable banners or related pages in mobile web beta
Related pages:
It's in mobile stable now.
Banners:
We don't enable them in beta any more.
Change-Id: Idc2f3507ebcd355add3569a87d3f3f189a37e895
---
M includes/MobileFrontend.hooks.php
1 file changed, 0 insertions(+), 32 deletions(-)
Approvals:
Pmiazga: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/MobileFrontend.hooks.php
b/includes/MobileFrontend.hooks.php
index a91af0f..508af6c 100644
--- a/includes/MobileFrontend.hooks.php
+++ b/includes/MobileFrontend.hooks.php
@@ -183,8 +183,6 @@
* @return bool
*/
public static function onOutputPageBeforeHTML( &$out, &$text ) {
- global $wgRelatedArticlesFooterBlacklistedSkins;
-
$context = MobileContext::singleton();
$title = $context->getTitle();
@@ -195,21 +193,6 @@
// Perform a few extra changes if we are in mobile mode
if ( $context->shouldDisplayMobileView() ) {
$text = ExtMobileFrontend::DOMParse( $out, $text );
- }
-
- // FIXME: remove the following when RelatedArticles are
promoted from beta to stable
- // Configure related articles to be shown in the footer for the
beta mode
- // The reason this code is here rather than inside the
'BeforePageDisplay' hook is
- // that we want to execute this code before RelatedArticles
decides not to show
- // related articles if the skin is blacklisted.
- if (
- ExtensionRegistry::getInstance()->isLoaded(
'RelatedArticles' ) &&
- MobileContext::singleton()->isBetaGroupMember()
- ) {
- $needle = array_search( 'minerva',
$wgRelatedArticlesFooterBlacklistedSkins ?: [] );
- if ( $needle !== false ) {
- array_splice(
$wgRelatedArticlesFooterBlacklistedSkins, $needle, 1 );
- }
}
if ( $context->shouldDisplayMobileView() &&
!$title->isMainPage() && !$title->isSpecialPage() ) {
@@ -720,7 +703,6 @@
* @return bool
*/
public static function onBeforePageDisplay( &$out, &$sk ) {
- global $wgWPBSkinBlacklist, $wgWPBEnableDefaultBanner;
$context = MobileContext::singleton();
$config = $context->getMFConfig();
$mfEnableXAnalyticsLogging = $config->get(
'MFEnableXAnalyticsLogging' );
@@ -730,20 +712,6 @@
$mfMobileUrlTemplate = $context->getMobileUrlTemplate();
$lessVars = $config->get( 'ResourceLoaderLESSVars' );
$noJsEditing = $config->get( 'MFAllowNonJavaScriptEditing' );
-
- // show banners using WikidataPageBanner, if installed and all
pre-conditions fulfilled
- if (
- ExtensionRegistry::getInstance()->isLoaded(
'WikidataPageBanner' ) &&
- $context->isBetaGroupMember()
- ) {
- // turn default banners on
- $wgWPBEnableDefaultBanner = true;
- // Turn on the banner experiment
- $needle = array_search( 'minerva', $wgWPBSkinBlacklist
);
- if ( $needle !== false ) {
- unset( $wgWPBSkinBlacklist[$needle] );
- }
- }
$title = $sk->getTitle();
$request = $context->getRequest();
--
To view, visit https://gerrit.wikimedia.org/r/345481
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Idc2f3507ebcd355add3569a87d3f3f189a37e895
Gerrit-PatchSet: 7
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: 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
