Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x

1 files changed, 5 insertions, 6 deletions

diff --git a/lib/noticelist.php b/lib/noticelist.php
index aa6ea278c..a106478ed 100644
--- a/lib/noticelist.php
+++ b/lib/noticelist.php
@@ -535,17 +535,19 @@ class NoticeListItem extends Widget
 
             $repeater = Profile::staticGet('id', $this->repeat->profile_id);
 
-            $attrs = array('href' => $repeater->profileurl,
+            $attrs = array('href' => $this->profile->profileurl,
                            'class' => 'url');
 
             if (!empty($repeater->fullname)) {
                 $attrs['title'] = $repeater->fullname . ' (' . $repeater->nickname . ')';
             }
 
-            $this->out->elementStart('span', 'repeat');
+            $this->out->elementStart('span', 'repeat vcard');
 
             $this->out->elementStart('a', $attrs);
 
+            $this->out->raw(_('Repeated by'));
+
             $avatar = $repeater->getAvatar(AVATAR_MINI_SIZE);
 
             $this->out->element('img', array('src' => ($avatar) ?
@@ -559,12 +561,9 @@ class NoticeListItem extends Widget
                                              $repeater->fullname :
                                              $repeater->nickname));
 
+            $this->out->element('span', 'nickname', $repeater->nickname);
             $this->out->elementEnd('a');
 
-            $text_link = XMLStringer::estring('a', $attrs, $repeater->nickname);
-
-            $this->out->raw(sprintf(_('Repeated by %s'), $text_link));
-
             $this->out->elementEnd('span');
         }
     }