jenkins-bot has submitted this change and it was merged.
Change subject: $wgZeroSiteOverride replaces $wgZeroEnableTesting for better
testing
......................................................................
$wgZeroSiteOverride replaces $wgZeroEnableTesting for better testing
To enable testing, set
$wgZeroSiteOverride = array( 'wikipedia', 'en' );
Change-Id: I36e43f5b4c6a4184094a000f2faae397381b0aa9
---
M ZeroBanner.php
M includes/PageRendering.php
M includes/ZeroSpecialPage.php
3 files changed, 13 insertions(+), 13 deletions(-)
Approvals:
Yurik: Looks good to me, approved
jenkins-bot: Verified
diff --git a/ZeroBanner.php b/ZeroBanner.php
index bc0474e..6ac48b6 100644
--- a/ZeroBanner.php
+++ b/ZeroBanner.php
@@ -110,7 +110,11 @@
'styles' => array( 'modules/forms.css' ),
);
-$wgZeroEnableTesting = false;
+/** @var false|string[] $wgZeroSiteOverride For testing, overrides
$wgConf->siteFromDB( $wgDBname )
+ * On a test wiki, set it to array( 'wikipedia', 'en' ) or similar.
+ * ZeroBanner explicitly checks for the site to equal 'wikipedia' before
enabling Zero.
+ */
+$wgZeroSiteOverride = false;
/** @var string $wgZeroBannerClusterDomain Temporary workaround - until I
figure out how to calculate it */
$wgZeroBannerClusterDomain = 'org';
diff --git a/includes/PageRendering.php b/includes/PageRendering.php
index 4fc7d5e..1bca19a 100644
--- a/includes/PageRendering.php
+++ b/includes/PageRendering.php
@@ -616,13 +616,11 @@
public function getWikiInfo() {
static $info = null;
if ( $info === null ) {
- global $wgConf, $wgDBname, $wgZeroBannerClusterDomain;
- list( $site, $langCode ) = $wgConf->siteFromDB(
$wgDBname );
- if ( $langCode === '' || $langCode === 'test' ) {
- $langCode = 'en'; // Useful for debugging,
should never be the case in production
- }
- if ( !$site ) {
- $site = 'wikipedia';
+ global $wgConf, $wgDBname, $wgZeroBannerClusterDomain,
$wgZeroSiteOverride;
+ if ( $wgZeroSiteOverride ) {
+ list( $site, $langCode ) = $wgZeroSiteOverride;
+ } else {
+ list( $site, $langCode ) = $wgConf->siteFromDB(
$wgDBname );
}
$subdomain = $this->isZeroSubdomain ? 'zero' : 'm';
$info = array( $langCode, $subdomain, $site,
$wgZeroBannerClusterDomain );
@@ -646,11 +644,9 @@
private function isZeroSite() {
static $isZero = null;
if ( $isZero === null ) {
- global $wgZeroEnableTesting;
$info = $this->getWikiInfo();
// @FIXME: this check should only see if this is a
mobileview, the rest is a check in partner's config
- $isZero = ( $info[2] === 'wikipedia' ||
$wgZeroEnableTesting )
- &&
MobileContext::singleton()->shouldDisplayMobileView();
+ $isZero = $info[2] === 'wikipedia' &&
MobileContext::singleton()->shouldDisplayMobileView();
}
return $isZero;
}
diff --git a/includes/ZeroSpecialPage.php b/includes/ZeroSpecialPage.php
index d09a38e..1912210 100644
--- a/includes/ZeroSpecialPage.php
+++ b/includes/ZeroSpecialPage.php
@@ -354,8 +354,8 @@
// Check that this domain name is handled by
local servers (disabled in testing)
// Last two or three parts of the domain name
must be found in the local vhost
$hp = explode( '.', $urlParts['host'] );
- global $wgZeroEnableTesting, $wgConf;
- if ( $wgZeroEnableTesting ||
+ global $wgZeroSiteOverride, $wgConf;
+ if ( $wgZeroSiteOverride ||
$wgConf->isLocalVHost( implode( '.',
array_slice( $hp, -2, 2 ) ) ) ||
$wgConf->isLocalVHost( implode( '.',
array_slice( $hp, -3, 3 ) ) )
) {
--
To view, visit https://gerrit.wikimedia.org/r/154719
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I36e43f5b4c6a4184094a000f2faae397381b0aa9
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/ZeroBanner
Gerrit-Branch: master
Gerrit-Owner: Yurik <[email protected]>
Gerrit-Reviewer: Yurik <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
