jenkins-bot has submitted this change and it was merged.
Change subject: Ensure when Winter is disabled it is really disabled
......................................................................
Ensure when Winter is disabled it is really disabled
If $wgVectorBetaWinter is off but beta feature is enabled Winter
should not be applied
Change-Id: I52d8e8ce2bb3709817fd57d063d87b2d31f03503
---
M VectorBeta.hooks.php
1 file changed, 15 insertions(+), 4 deletions(-)
Approvals:
JGonera: Looks good to me, approved
jenkins-bot: Verified
diff --git a/VectorBeta.hooks.php b/VectorBeta.hooks.php
index e808216..f1c1a72 100644
--- a/VectorBeta.hooks.php
+++ b/VectorBeta.hooks.php
@@ -53,6 +53,16 @@
}
/**
+ * Checks whether fixed header experiment can be run or not
+ * @param User $user
+ * @return bool
+ */
+ static function isFixedHeaderEnabled( $user ) {
+ global $wgVectorBetaWinter;
+ return $wgVectorBetaWinter && BetaFeatures::isFeatureEnabled(
$user, 'betafeatures-vector-fixedheader' );
+ }
+
+ /**
* GetSkinTemplateOutputPageBeforeExec
* Modifies the template to swap out the default navigation controls
with new Winter
* ones.
@@ -71,7 +81,7 @@
if ( !class_exists( 'BetaFeatures' ) ) {
wfDebugLog( 'VectorBeta', 'The BetaFeatures extension
is not installed' );
return true;
- } else if ( BetaFeatures::isFeatureEnabled( $skin->getUser(),
'betafeatures-vector-fixedheader' ) ) {
+ } else if ( self::isFixedHeaderEnabled( $skin->getUser() ) ) {
$data = $tpl->data;
$skin = $data['skin'];
$nav = $data['content_navigation'];
@@ -305,10 +315,11 @@
*/
static function skinVectorStyleModules( $skin, &$modules ) {
global $wgVectorBetaTypography;
+
if ( class_exists( 'BetaFeatures' ) ) {
$typeEnabled = $wgVectorBetaTypography &&
BetaFeatures::isFeatureEnabled(
$skin->getUser(), 'betafeatures-vector-typography-update' );
- $fixedHeaderEnabled = BetaFeatures::isFeatureEnabled(
$skin->getUser(), 'betafeatures-vector-fixedheader' );
+
if ( $typeEnabled ) {
$index = array_search( 'skins.vector.styles',
$modules );
if ( $index !== false ) {
@@ -316,7 +327,7 @@
}
$modules[] = 'skins.vector.beta';
}
- if ( $fixedHeaderEnabled ) {
+ if ( self::isFixedHeaderEnabled( $skin->getUser() ) ) {
$modules[] = 'skins.vector.header.beta';
}
} else {
@@ -343,7 +354,7 @@
$modules = array();
// Fixed header experiment modules
- if ( BetaFeatures::isFeatureEnabled( $user,
'betafeatures-vector-fixedheader' ) ) {
+ if ( self::isFixedHeaderEnabled( $user ) ) {
$modules[] = 'skins.vector.headerjs.beta';
}
--
To view, visit https://gerrit.wikimedia.org/r/130373
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I52d8e8ce2bb3709817fd57d063d87b2d31f03503
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VectorBeta
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson <jrob...@wikimedia.org>
Gerrit-Reviewer: JGonera <jgon...@wikimedia.org>
Gerrit-Reviewer: Jorm <bhar...@wikimedia.org>
Gerrit-Reviewer: Kaldari <rkald...@wikimedia.org>
Gerrit-Reviewer: Yuvipanda <yuvipa...@gmail.com>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
