Awight has uploaded a new change for review.
https://gerrit.wikimedia.org/r/284614
Change subject: Validate config paths when loading cached values
......................................................................
Validate config paths when loading cached values
Change-Id: I4823c8054a3b24e00c54fd36065f5e17d21074f9
---
M Core/Configuration.php
1 file changed, 10 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/SmashPig
refs/changes/14/284614/1
diff --git a/Core/Configuration.php b/Core/Configuration.php
index 5a90727..0c06644 100644
--- a/Core/Configuration.php
+++ b/Core/Configuration.php
@@ -123,12 +123,16 @@
$cacheObj = apc_fetch( "smashpig-settings-{$view}-time",
$success );
if ( $success ) {
- $defaultCacheTime = $cacheObj[ 'default-time' ];
- $overrideCacheTime = $cacheObj[ 'override-time' ];
+ $defaultCacheTime = $cacheObj['default-time'];
+ $overrideCacheTime = $cacheObj['override-time'];
+ $cacheDefaultPath = $cacheObj['default-path'];
+ $cacheOverridePath = $cacheObj['override-path'];
- if ( ( $defaultFileTime == $defaultCacheTime ) && (
$overrideFileTime == $overrideCacheTime ) ) {
+ if ( ( $defaultFileTime == $defaultCacheTime ) && (
$overrideFileTime == $overrideCacheTime )
+ && ( $cacheDefaultPath == $defaultFile ) && (
$cacheOverridePath == $overrideFile )
+ ) {
// The cached values are valid
- $this->options = $cacheObj[ 'values' ];
+ $this->options = $cacheObj['values'];
return true;
}
}
@@ -152,6 +156,8 @@
array(
'default-time' => $defaultFileTime,
'override-time' => $overrideFileTime,
+ 'default-path' => $defaultFile,
+ 'override-path' => $overrideFile,
'values' => $this->options,
)
);
--
To view, visit https://gerrit.wikimedia.org/r/284614
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4823c8054a3b24e00c54fd36065f5e17d21074f9
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/SmashPig
Gerrit-Branch: master
Gerrit-Owner: Awight <awi...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
