eliseuamaro
/
gnu-social
forked from GNUsocial/gnu-social
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

This commit is contained in:
Siebrand Mazeland 2009-12-14 22:29:35 +01:00
parent 8ab21542d2 1ace5c400e
commit 5c13f855ef
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
actions/apistatusesretweet.php
View File

@ -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;
}

6
lib/noticelist.php
View File

@ -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),