Merge "Fix Postgres support"

[lhc/web/wiklou.git] / includes / site / CachingSiteStore.php

diff --git a/includes/site/CachingSiteStore.php b/includes/site/CachingSiteStore.php
index 9243f12..f3cd1e8 100644 (file)
--- a/includes/site/CachingSiteStore.php
+++ b/includes/site/CachingSiteStore.php
@@ -90,7 +90,7 @@ class CachingSiteStore implements SiteStore {
        private function getCacheKey() {
                if ( $this->cacheKey === null ) {
                        $type = 'SiteList#' . SiteList::getSerialVersionId();
-                       $this->cacheKey = wfMemcKey( "sites/$type" );
+                       $this->cacheKey = $this->cache->makeKey( "sites/$type" );
                }
 
                return $this->cacheKey;
@@ -142,7 +142,7 @@ class CachingSiteStore implements SiteStore {
         * @return bool Success indicator
         */
        public function saveSite( Site $site ) {
-               return $this->saveSites( array( $site ) );
+               return $this->saveSites( [ $site ] );
        }
 
        /**
@@ -168,9 +168,11 @@ class CachingSiteStore implements SiteStore {
        }
 
        /**
-        * Purges the internal and external cache of the site list, forcing the list
+        * Purges the internal and external cache of the site list, forcing the list.
         * of sites to be reloaded.
         *
+        * Only use this for testing, as APC is typically used and is per-server
+        *
         * @since 1.25
         */
        public function reset() {
@@ -182,6 +184,8 @@ class CachingSiteStore implements SiteStore {
        /**
         * Clears the list of sites stored.
         *
+        * Only use this for testing, as APC is typically used and is per-server.
+        *
         * @see SiteStore::clear()
         *
         * @return bool Success