Don't add content as title for notes

diff --git a/classes/Notice.php b/classes/Notice.php
index 541a850f0c94bcf612db2c5f8ecdc4ddea897ddf..3891f431e460a04cd947e80edfb78dba3d8b43d3 100644 (file)
--- a/classes/Notice.php
+++ b/classes/Notice.php
@@ -1508,7 +1508,6 @@ class Notice extends Managed_DataObject
             $act->time    = strtotime($this->created);
             $act->link    = $this->bestUrl();
             $act->content = common_xml_safe_str($this->rendered);
-            $act->title   = common_xml_safe_str($this->content);
 
             $profile = $this->getProfile();
 

diff --git a/lib/activity.php b/lib/activity.php
index b8c94262685473fa7c8acae82d576bb629a42b0c..2ec2176d39f735d8140e5c5959fbd1a75491136d 100644 (file)
--- a/lib/activity.php
+++ b/lib/activity.php
@@ -589,7 +589,13 @@ class Activity
 
         } else {
             $xs->element('id', null, $this->id);
-            $xs->element('title', null, $this->title);
+
+            if ($this->title) {
+                $xs->element('title', null, $this->title);
+            } else {
+                // Require element
+                $xs->element('title', null, "");
+            }
 
             $xs->element('content', array('type' => 'html'), $this->content);