fixup conflicts

darcs-hash:20080706221758-84dde-5e222a282f9a1bd242d2653700c444e93e21cc7f.gz
This commit is contained in:
Evan Prodromou 2008-07-06 18:17:58 -04:00
parent 0b21ac3dd7
commit ab3e1556ba
1 changed files with 3 additions and 1 deletions

View File

@ -73,7 +73,9 @@ class NewnoticeAction extends Action {
common_server_error(_t('Problem saving notice.'));
return;
}
common_save_replies($notice);
common_broadcast_notice($notice);
$returnto = $this->trimmed('returnto');
if ($returnto) {