GNUsocial
/
gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Merge branch 'master' into testing

This commit is contained in:
Evan Prodromou 2011-09-08 09:03:33 -04:00
parent 5eba1030ae 4f86e05d03
commit 9948523c33
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
classes/Notice.php
View File

@ -1585,8 +1585,10 @@ class Notice extends Managed_DataObject
if (!empty($this->repeat_of)) { if (!empty($this->repeat_of)) {
$repeat = Notice::staticGet('id', $this->repeat_of); $repeat = Notice::staticGet('id', $this->repeat_of);
$ctx->forwardID = $repeat->uri; if (!empty($repeat)) {
$ctx->forwardUrl = $repeat->bestUrl(); $ctx->forwardID = $repeat->uri;
$ctx->forwardUrl = $repeat->bestUrl();
}
} }
$act->context = $ctx; $act->context = $ctx;