Merge branch 'master' into testing

This commit is contained in:
Evan Prodromou 2011-09-08 09:03:33 -04:00
commit 9948523c33
1 changed files with 4 additions and 2 deletions

View File

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