Merge "Use new WikiMap::getCurrentWikiDomain() for objectcache and profiler keyspace"

diff --git a/includes/objectcache/ObjectCache.php b/includes/objectcache/ObjectCache.php
index ae42f80..cb6249c 100644 (file)
--- a/includes/objectcache/ObjectCache.php
+++ b/includes/objectcache/ObjectCache.php
@@ -154,7 +154,7 @@ class ObjectCache {
                        return $keyspace;
                }
 
-               return wfWikiID();
+               return WikiMap::getCurrentWikiDomain()->getId();
        }
 
        /**

diff --git a/includes/profiler/Profiler.php b/includes/profiler/Profiler.php
index bf4ddc7..5c38159 100644 (file)
--- a/includes/profiler/Profiler.php
+++ b/includes/profiler/Profiler.php
@@ -115,7 +115,7 @@ abstract class Profiler {
         */
        public function getProfileID() {
                if ( $this->profileID === false ) {
-                       return wfWikiID();
+                       return WikiMap::getCurrentWikiDomain()->getId();
                } else {
                        return $this->profileID;
                }