Need to always emit statusnet:notice_info so it's available in profile feeds

diff --git a/classes/Notice.php b/classes/Notice.php
index 875bcaa020b91a5c55b37b6333a16274a186c794..7c3b5b5191b986b5ed7c2d4b0d80cc789a837f4f 100644 (file)
--- a/classes/Notice.php
+++ b/classes/Notice.php
@@ -1212,24 +1212,6 @@ class Notice extends Memcached_DataObject
 
             $xs->element('icon', null, $profile->avatarUrl(AVATAR_PROFILE_SIZE));
             $xs->element('updated', null, common_date_w3dtf($this->created));
-
-            $noticeInfoAttr = array(
-                'local_id'   => $this->id,    // local notice ID (useful to clients for ordering)
-                'source'     => $this->source // the client name (source attribution)
-            );
-
-            $ns = $this->getSource();
-            if ($ns) {
-                if (!empty($ns->url)) {
-                    $noticeInfoAttr['source_link'] = $ns->url;
-                }
-            }
-
-            if (!empty($cur)) {
-                $noticeInfoAttr['favorited'] = ($cur->hasFave($this)) ? 'true' : 'false';
-            }
-
-            $xs->element('statusnet:notice_info', $noticeInfoAttr, null);
         }
 
         if ($source) {
@@ -1252,6 +1234,24 @@ class Notice extends Memcached_DataObject
         $xs->element('published', null, common_date_w3dtf($this->created));
         $xs->element('updated', null, common_date_w3dtf($this->created));
 
+        $noticeInfoAttr = array(
+            'local_id'   => $this->id,    // local notice ID (useful to clients for ordering)
+            'source'     => $this->source // the client name (source attribution)
+        );
+
+        $ns = $this->getSource();
+        if ($ns) {
+            if (!empty($ns->url)) {
+                $noticeInfoAttr['source_link'] = $ns->url;
+            }
+        }
+
+        if (!empty($cur)) {
+            $noticeInfoAttr['favorited'] = ($cur->hasFave($this)) ? 'true' : 'false';
+        }
+
+        $xs->element('statusnet:notice_info', $noticeInfoAttr, null);
+
         if ($this->reply_to) {
             $reply_notice = Notice::staticGet('id', $this->reply_to);
             if (!empty($reply_notice)) {