diff options
| author | Siebrand Mazeland <s.mazeland@xs4all.nl> | 2009-12-14 22:29:35 +0100 |
|---|---|---|
| committer | Siebrand Mazeland <s.mazeland@xs4all.nl> | 2009-12-14 22:29:35 +0100 |
| commit | 5c13f855efd52cc9c175922cb1e913028a07b31d (patch) | |
| tree | c8d9c8634d5a7bdf0d631eb6f768aa7d4975e30a | |
| parent | 8ab21542d2102c678c4d667a1fec44d2c3f67712 (diff) | |
| parent | 1ace5c400ebc30d2815182690e5433b918aeaf59 (diff) | |
Merge branch '0.9.x' of git://gitorious.org/statusnet/mainline into 0.9.x
| -rw-r--r-- | actions/apistatusesretweet.php | 2 | ||||
| -rw-r--r-- | lib/noticelist.php | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/actions/apistatusesretweet.php b/actions/apistatusesretweet.php index 85de79d5c..d9d4820c0 100644 --- a/actions/apistatusesretweet.php +++ b/actions/apistatusesretweet.php @@ -80,7 +80,7 @@ class ApiStatusesRetweetAction extends ApiAuthAction $this->user = $this->auth_user; if ($this->user->id == $notice->profile_id) { - $this->clientError(_('Cannot repeat your own notice.')); + $this->clientError(_('Cannot repeat your own notice.'), 400, $this->format); return false; } diff --git a/lib/noticelist.php b/lib/noticelist.php index a106478ed..85e1befcc 100644 --- a/lib/noticelist.php +++ b/lib/noticelist.php @@ -535,7 +535,7 @@ class NoticeListItem extends Widget $repeater = Profile::staticGet('id', $this->repeat->profile_id); - $attrs = array('href' => $this->profile->profileurl, + $attrs = array('href' => $repeater->profileurl, 'class' => 'url'); if (!empty($repeater->fullname)) { @@ -544,12 +544,12 @@ class NoticeListItem extends Widget $this->out->elementStart('span', 'repeat vcard'); - $this->out->elementStart('a', $attrs); - $this->out->raw(_('Repeated by')); $avatar = $repeater->getAvatar(AVATAR_MINI_SIZE); + $this->out->elementStart('a', $attrs); + $this->out->element('img', array('src' => ($avatar) ? $avatar->displayUrl() : Avatar::defaultImage(AVATAR_MINI_SIZE), |