From 78f0d6bbd21ed84733e960201c4652e69c565450 Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Fri, 12 Mar 2010 01:12:30 +0000
Subject: Scrub all atom output with common_xml_safe_str()

---
 classes/Notice.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'classes/Notice.php')

diff --git a/classes/Notice.php b/classes/Notice.php
index 40a6263e5..a704053a0 100644
--- a/classes/Notice.php
+++ b/classes/Notice.php
@@ -1151,7 +1151,7 @@ class Notice extends Memcached_DataObject
             $xs->elementEnd('source');
         }
 
-        $xs->element('title', null, $this->content);
+        $xs->element('title', null, common_xml_safe_str($this->content));
 
         if ($author) {
             $xs->raw($profile->asAtomAuthor());
@@ -1227,7 +1227,11 @@ class Notice extends Memcached_DataObject
             }
         }
 
-        $xs->element('content', array('type' => 'html'), $this->rendered);
+        $xs->element(
+            'content',
+            array('type' => 'html'),
+            common_xml_safe_str($this->rendered)
+        );
 
         $tag = new Notice_tag();
         $tag->notice_id = $this->id;
-- 
cgit v1.2.3