From 94ff04e1903cf3a544e52e64846538dee5f23fb3 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Wed, 8 Dec 2010 07:25:55 -0500
Subject: Don't cache user-specific information for Notice atom entries

---
 lib/activity.php | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

(limited to 'lib/activity.php')

diff --git a/lib/activity.php b/lib/activity.php
index d3eeadcee..c3a984a7b 100644
--- a/lib/activity.php
+++ b/lib/activity.php
@@ -327,16 +327,8 @@ class Activity
         return null;
     }
 
-    function asString($namespace=false, $author=true)
+    function asString($namespace=false, $author=true, $source=false)
     {
-        $c = Cache::instance();
-
-        $str = $c->get(Cache::codeKey('activity:as-string:'.$this->id));
-
-        if (!empty($str)) {
-            return $str;
-        }
-
         $xs = new XMLStringer(true);
 
         if ($namespace) {
@@ -502,7 +494,7 @@ class Activity
 
         // Info on the source feed
 
-        if (!empty($this->source)) {
+        if ($source && !empty($this->source)) {
             $xs->elementStart('source');
 	    
             $xs->element('id', null, $this->source->id);
@@ -559,8 +551,6 @@ class Activity
 
         $str = $xs->getString();
 	
-        $c->set(Cache::codeKey('activity:as-string:'.$this->id), $str);
-	
         return $str;
     }
 
-- 
cgit v1.2.3-54-g00ecf