Merge branch 'master' into testing

[quix0rs-gnu-social.git] / actions / getfile.php

diff --git a/actions/getfile.php b/actions/getfile.php
index ad411225030c6c5155cb1945c5ac21cc90787f1d..4b57a05cd6bbe2c42af058e9e87f29ceb0a55095 100644 (file)
--- a/actions/getfile.php
+++ b/actions/getfile.php
@@ -125,9 +125,9 @@ class GetfileAction extends Action
             return null;
         }
 
-        $cache = common_memcache();
+        $cache = Cache::instance();
         if($cache) {
-            $key = common_cache_key('attachments:etag:' . $this->path);
+            $key = Cache::key('attachments:etag:' . $this->path);
             $etag = $cache->get($key);
             if($etag === false) {
                 $etag = crc32(file_get_contents($this->path));