Fix for "#foo !foo" in same notice failing during save, causing failout before distri...

[quix0rs-gnu-social.git] / actions / showstream.php

diff --git a/actions/showstream.php b/actions/showstream.php
index 90ff67073a1bd7d120cbcae560b010e9031d12bc..f9407e35a1f7890189b817c39dd8900c2c6a1f33 100644 (file)
--- a/actions/showstream.php
+++ b/actions/showstream.php
@@ -131,14 +131,14 @@ class ShowstreamAction extends ProfileAction
                      new Feed(Feed::RSS2,
                               common_local_url('ApiTimelineUser',
                                                array(
-                                                    'id' => $this->user->nickname,
+                                                    'id' => $this->user->id,
                                                     'format' => 'rss')),
                               sprintf(_('Notice feed for %s (RSS 2.0)'),
                                       $this->user->nickname)),
                      new Feed(Feed::ATOM,
                               common_local_url('ApiTimelineUser',
                                                array(
-                                                    'id' => $this->user->nickname,
+                                                    'id' => $this->user->id,
                                                     'format' => 'atom')),
                               sprintf(_('Notice feed for %s (Atom)'),
                                       $this->user->nickname)),
@@ -178,6 +178,15 @@ class ShowstreamAction extends ProfileAction
         $this->element('link', array('rel' => 'microsummary',
                                      'href' => common_local_url('microsummary',
                                                                 array('nickname' => $this->profile->nickname))));
+
+        $rsd = common_local_url('rsd',
+                                array('nickname' => $this->profile->nickname));
+
+        // RSD, http://tales.phrasewise.com/rfc/rsd
+        $this->element('link', array('rel' => 'EditURI',
+                                     'type' => 'application/rsd+xml',
+                                     'href' => $rsd));
+
     }
 
     function showProfile()
@@ -291,23 +300,6 @@ class ProfileNoticeListItem extends NoticeListItem
 
             $this->out->elementStart('span', 'repeat');
 
-            $this->out->elementStart('a', $attrs);
-
-            $avatar = $this->profile->getAvatar(AVATAR_MINI_SIZE);
-
-            $this->out->element('img', array('src' => ($avatar) ?
-                                             $avatar->displayUrl() :
-                                             Avatar::defaultImage(AVATAR_MINI_SIZE),
-                                             'class' => 'avatar photo',
-                                             'width' => AVATAR_MINI_SIZE,
-                                             'height' => AVATAR_MINI_SIZE,
-                                             'alt' =>
-                                             ($this->profile->fullname) ?
-                                             $this->profile->fullname :
-                                             $this->profile->nickname));
-
-            $this->out->elementEnd('a');
-
             $text_link = XMLStringer::estring('a', $attrs, $this->profile->nickname);
 
             $this->out->raw(sprintf(_('Repeat of %s'), $text_link));