We are no longer offering accounts on this server. Consider https://gitlab.freedesktop.org/ as a place to host projects.

Commit 5c13f855 authored by Siebrand Mazeland's avatar Siebrand Mazeland

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

parents 8ab21542 1ace5c40
......@@ -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;
}
......
......@@ -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),
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment