Merge "Replace cpPosTime cookie/parameter with cpPosIndex"

[lhc/web/wiklou.git] / includes / cache / MessageCache.php

diff --git a/includes/cache/MessageCache.php b/includes/cache/MessageCache.php
index 20cf64c..4872186 100644 (file)
--- a/includes/cache/MessageCache.php
+++ b/includes/cache/MessageCache.php
@@ -156,22 +156,22 @@ class MessageCache {
        }
 
        /**
-        * @param WANObjectCache $wanCache WAN cache instance
-        * @param BagOStuff $clusterCache Cluster cache instance
-        * @param BagOStuff $srvCache Server cache instance
+        * @param WANObjectCache $wanCache
+        * @param BagOStuff $clusterCache
+        * @param BagOStuff $serverCache
         * @param bool $useDB Whether to look for message overrides (e.g. MediaWiki: pages)
         * @param int $expiry Lifetime for cache. @see $mExpiry.
         */
        public function __construct(
                WANObjectCache $wanCache,
                BagOStuff $clusterCache,
-               BagOStuff $srvCache,
+               BagOStuff $serverCache,
                $useDB,
                $expiry
        ) {
                $this->wanCache = $wanCache;
                $this->clusterCache = $clusterCache;
-               $this->srvCache = $srvCache;
+               $this->srvCache = $serverCache;
 
                $this->mDisable = !$useDB;
                $this->mExpiry = $expiry;
@@ -187,7 +187,7 @@ class MessageCache {
 
                if ( !$this->mParserOptions ) {
                        if ( !$wgUser->isSafeToLoad() ) {
-                               // $wgUser isn't loaded yet, so don't try to get a
+                               // $wgUser isn't unstubbable yet, so don't try to get a
                                // ParserOptions for it. And don't cache this ParserOptions
                                // either.
                                $po = ParserOptions::newFromAnon();
@@ -874,7 +874,7 @@ class MessageCache {
         * the site language.
         *
         * @see MessageCache::get
-        * @param Language $lang Preferred language
+        * @param Language|StubObject $lang Preferred language
         * @param string $lckey Lowercase key for the message (as for localisation cache)
         * @param bool $useDB Whether to include messages from the wiki database
         * @return string|bool The message, or false if not found
@@ -899,7 +899,7 @@ class MessageCache {
         * Given a language, try and fetch messages from that language and its fallbacks.
         *
         * @see MessageCache::get
-        * @param Language $lang Preferred language
+        * @param Language|StubObject $lang Preferred language
         * @param string $lckey Lowercase key for the message (as for localisation cache)
         * @param bool $useDB Whether to include messages from the wiki database
         * @param bool[] $alreadyTried Contains true for each language that has been tried already
@@ -1048,8 +1048,7 @@ class MessageCache {
                if ( $titleObj->getLatestRevID() ) {
                        $revision = Revision::newKnownCurrent(
                                $dbr,
-                               $titleObj->getArticleID(),
-                               $titleObj->getLatestRevID()
+                               $titleObj
                        );
                } else {
                        $revision = false;