Yurik has uploaded a new change for review.
https://gerrit.wikimedia.org/r/164145
Change subject: Fix private access from closure 5.3 vs 5.4 bug
......................................................................
Fix private access from closure 5.3 vs 5.4 bug
Change-Id: Ia458fa7e2a5677fabeaebc5e43192d0d96e721fa
---
M includes/PageRendering.php
M includes/ZeroConfig.php
2 files changed, 7 insertions(+), 9 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ZeroBanner
refs/changes/45/164145/1
diff --git a/includes/PageRendering.php b/includes/PageRendering.php
index 88bcb95..db1c5e8 100644
--- a/includes/PageRendering.php
+++ b/includes/PageRendering.php
@@ -87,7 +87,7 @@
$cfg['enableHttps'] = $config->enableHttps();
$cfg['sites'] = $config->sites(); // todo: remove this
value once it's out of cache
$cfg['domains'] = $config->domains();
- $cfg['proxy'] = $config->proxy();
+ $cfg['proxy'] = $config->proxy();1
$cfg['ipset'] = $config->ipset();
$cfg['bannerUrl'] = $config->bannerUrl();
$cfg['bannerWarning'] = $config->bannerWarning();
diff --git a/includes/ZeroConfig.php b/includes/ZeroConfig.php
index 6837157..52fa8f1 100644
--- a/includes/ZeroConfig.php
+++ b/includes/ZeroConfig.php
@@ -30,7 +30,9 @@
private $mode = null;
private $ipset = null;
private $proxy = null;
- private $enabledValue = false;
+
+ /** @var bool DO NOT use from outside of the class. Public needed for
the closure call */
+ public $enabledValue = false;
const ignoreNetwork = 0x1;
const ignoreDisabled = 0x2;
@@ -333,12 +335,12 @@
return function ( JCValue $jcv, array $path ) use ( $self ) {
if ( $jcv->isMissing() ) {
$jcv->setValue( true );
- $self->setEnabled( true );
+ $self->enabledValue = true;
return true;
}
$v = $jcv->getValue();
if ( is_bool( $v ) ) {
- $self->setEnabled( $v );
+ $self->enabledValue = $v;
return true;
}
if ( JCUtils::isList( $v ) && count( $v ) === 2 ) {
@@ -388,7 +390,7 @@
$until->format(
'Y-m-d\TH:i:s\Z' )
) );
$now = new DateTime( 'now', new
DateTimeZone( 'UTC' ) );
- $self->setEnabled( $now > $from
&& $now < $until );
+ $self->enabledValue = $now >
$from && $now < $until;
return true;
}
}
@@ -672,9 +674,5 @@
}
return true;
};
- }
-
- private function setEnabled( $value ) {
- $this->enabledValue = $value;
}
}
--
To view, visit https://gerrit.wikimedia.org/r/164145
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia458fa7e2a5677fabeaebc5e43192d0d96e721fa
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ZeroBanner
Gerrit-Branch: master
Gerrit-Owner: Yurik <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
