use codeKey() in activity caching

diff --git a/classes/Notice.php b/classes/Notice.php
index 46e1dca35e57f87022a2aab3230c53aa7a2b10e1..d6710c3e272b8eea85ddf7a4c4cfdfcb0c27e755 100644 (file)
--- a/classes/Notice.php
+++ b/classes/Notice.php
@@ -1236,7 +1236,7 @@ class Notice extends Memcached_DataObject
 
     function asActivity($cur = null, $source = false)
     {
-        $act = self::cacheGet('notice:as-activity:'.$this->id);
+        $act = self::cacheGet(Cache::codeKey('notice:as-activity:'.$this->id));
 
         if (!empty($act)) {
             return $act;
@@ -1406,7 +1406,7 @@ class Notice extends Memcached_DataObject
             Event::handle('EndNoticeAsActivity', array($this, &$act));
         }
        
-        self::cacheSet('notice:as-activity:'.$this->id, $act);
+        self::cacheSet(Cache::codeKey('notice:as-activity:'.$this->id), $act);
 
         return $act;
     }

diff --git a/lib/activity.php b/lib/activity.php
index 712800817c71351d6ff7806b3efb934cbc52d3da..d3eeadcee9eb106d095e7e901f892e58a476a338 100644 (file)
--- a/lib/activity.php
+++ b/lib/activity.php
@@ -331,7 +331,7 @@ class Activity
     {
         $c = Cache::instance();
 
-        $str = $c->get('activity:as-string:'.Cache::keyize($this->id));
+        $str = $c->get(Cache::codeKey('activity:as-string:'.$this->id));
 
         if (!empty($str)) {
             return $str;
@@ -559,7 +559,7 @@ class Activity
 
         $str = $xs->getString();
        
-        $c->set('activity:as-string:'.Cache::keyize($this->id), $str);
+        $c->set(Cache::codeKey('activity:as-string:'.$this->id), $str);
        
         return $str;
     }