X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fnewnotice.php;h=b65edf4c30596470d94bd1a47bbe9bdc5b01ad56;hb=4a0b1a9ea9d288e42ac03c43ef904b0565a7087f;hp=f17ada3072e49785b56abf32aeceb35825a8f59e;hpb=659feb5f43a1bd75b385fa2c96b568b71d2bcd96;p=quix0rs-gnu-social.git diff --git a/actions/newnotice.php b/actions/newnotice.php index f17ada3072..b65edf4c30 100644 --- a/actions/newnotice.php +++ b/actions/newnotice.php @@ -28,14 +28,7 @@ class NewnoticeAction extends Action { if (!common_logged_in()) { common_user_error(_t('Not logged in.')); } else if ($_SERVER['REQUEST_METHOD'] == 'POST') { - $id = $this->save_new_notice(); - if ($id) { - common_broadcast_notices($id); - common_redirect(common_local_url('shownotice', - array('notice' => $id)), 303); - } else { - common_server_error(_t('Problem saving notice.')); - } + $this->save_new_notice(); } else { $this->show_form(); } @@ -50,7 +43,7 @@ class NewnoticeAction extends Action { $notice->profile_id = $user->id; # user id *is* profile id $notice->created = DB_DataObject_Cast::dateTime(); # Default theme uses 'content' for something else - $notice->content = $this->trimmed('noticecontent'); + $notice->content = $this->trimmed('status_textarea'); if (!$notice->content) { $this->show_form(_t('No content!')); @@ -60,7 +53,24 @@ class NewnoticeAction extends Action { return; } - return $notice->insert(); + $id = $notice->insert(); + + if (!$id) { + common_server_error(_t('Problem saving notice.')); + return; + } + + $orig = clone($notice); + $notice->uri = common_mint_tag('notice:' . $id); + + if (!$notice->update($orig)) { + common_server_error(_t('Problem saving notice.')); + return; + } + + common_broadcast_notice($notice); + common_redirect(common_local_url('shownotice', + array('notice' => $id)), 303); } function show_form($msg=NULL) {