Merge "MessageCache: Minor wgMsgCacheExpiry doc fix, and clear constant access"

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 7e13fc2..d80c8cc 100644 (file)
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -3119,7 +3119,9 @@ $wgTranslateNumerals = true;
 $wgUseDatabaseMessages = true;
 
 /**
- * Expiry time for the message cache key
+ * Expiry time for the message cache key, in seconds.
+ *
+ * @var int Defaults to 24 hours.
  */
 $wgMsgCacheExpiry = 86400;
 

diff --git a/includes/cache/MessageCache.php b/includes/cache/MessageCache.php
index 93fdb16..c2913e5 100644 (file)
--- a/includes/cache/MessageCache.php
+++ b/includes/cache/MessageCache.php
@@ -1090,7 +1090,7 @@ class MessageCache {
                $fname = __METHOD__;
                return $this->srvCache->getWithSetCallback(
                        $this->srvCache->makeKey( 'messages-big', $hash, $dbKey ),
-                       IExpiringStore::TTL_MINUTE,
+                       BagOStuff::TTL_MINUTE,
                        function () use ( $code, $dbKey, $hash, $fname ) {
                                return $this->wanCache->getWithSetCallback(
                                        $this->bigMessageCacheKey( $hash, $dbKey ),