Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 1.0.x

[quix0rs-gnu-social.git] / plugins / Minify / minify.php

diff --git a/plugins/Minify/minify.php b/plugins/Minify/minify.php
index 9a59c4223c8ec1f613b995eefc01a66275a748ef..e012a40272c27d5eef0c89209ae7c4e101a06e8e 100644 (file)
--- a/plugins/Minify/minify.php
+++ b/plugins/Minify/minify.php
@@ -74,9 +74,9 @@ class MinifyAction extends Action
     {
         parent::handle($args);
         
-        $c = common_memcache();
+        $c = Cache::instance();
         if (!empty($c)) {
-            $cacheKey = common_cache_key(MinifyPlugin::cacheKey . ':' . $this->file . '?v=' . empty($this->v)?'':$this->v);
+            $cacheKey = Cache::key(MinifyPlugin::cacheKey . ':' . $this->file . '?v=' . empty($this->v)?'':$this->v);
             $out = $c->get($cacheKey);
         }
         if(empty($out)) {