Merge "Convert ForeignApiRepo::httpGetCached() to the WAN cache"

diff --combined includes/filerepo/ForeignAPIRepo.php
index 3747e60,38305dc..0a3314e
--- 1/includes/filerepo/ForeignAPIRepo.php
--- 2/includes/filerepo/ForeignAPIRepo.php
+++ b/includes/filerepo/ForeignAPIRepo.php
@@@ -329,7 -329,7 +329,7 @@@ class ForeignAPIRepo extends FileRepo 
         * @return bool|string
         */
        function getThumbUrlFromCache( $name, $width, $height, $params = "" ) {
 -              global $wgMemc;
 +              $cache = ObjectCache::getMainWANInstance();
                // We can't check the local cache using FileRepo functions because
                // we override fileExistsBatch(). We have to use the FileBackend directly.
                $backend = $this->getBackend(); // convenience
@@@ -342,7 -342,7 +342,7 @@@
                $sizekey = "$width:$height:$params";
  
                /* Get the array of urls that we already know */
 -              $knownThumbUrls = $wgMemc->get( $key );
 +              $knownThumbUrls = $cache->get( $key );
                if ( !$knownThumbUrls ) {
                        /* No knownThumbUrls for this file */
                        $knownThumbUrls = array();
@@@ -388,7 -388,7 +388,7 @@@
                        if ( $remoteModified < $modified && $diff < $this->fileCacheExpiry ) {
                                /* Use our current and already downloaded thumbnail */
                                $knownThumbUrls[$sizekey] = $localUrl;
 -                              $wgMemc->set( $key, $knownThumbUrls, $this->apiThumbCacheExpiry );
 +                              $cache->set( $key, $knownThumbUrls, $this->apiThumbCacheExpiry );
  
                                return $localUrl;
                        }
@@@ -410,7 -410,7 +410,7 @@@
                        return $foreignUrl;
                }
                $knownThumbUrls[$sizekey] = $localUrl;
 -              $wgMemc->set( $key, $knownThumbUrls, $this->apiThumbCacheExpiry );
 +              $cache->set( $key, $knownThumbUrls, $this->apiThumbCacheExpiry );
                wfDebug( __METHOD__ . " got local thumb $localUrl, saving to cache \n" );
  
                return $localUrl;
@@@ -552,19 -552,16 +552,16 @@@
                }
  
                if ( !isset( $this->mQueryCache[$url] ) ) {
-                       global $wgMemc;
- 
-                       $key = $this->getLocalCacheKey( get_class( $this ), $target, md5( $url ) );
-                       $data = $wgMemc->get( $key );
- 
-                       if ( !$data ) {
-                               $data = self::httpGet( $url );
- 
-                               if ( !$data ) {
-                                       return null;
+                       $data = ObjectCache::getMainWANInstance()->getWithSetCallback(
+                               $this->getLocalCacheKey( get_class( $this ), $target, md5( $url ) ),
+                               $cacheTTL,
+                               function () use ( $url ) {
+                                       return ForeignAPIRepo::httpGet( $url );
                                }
+                       );
  
-                               $wgMemc->set( $key, $data, $cacheTTL );
+                       if ( !$data ) {
+                               return null;
                        }
  
                        if ( count( $this->mQueryCache ) > 100 ) {