From: Evan Prodromou Date: Wed, 21 May 2008 12:31:06 +0000 (-0400) Subject: move error display to save_new_notice X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=55fdd0b981c0a429186eda6f8d95b06f67eade76;p=quix0rs-gnu-social.git move error display to save_new_notice darcs-hash:20080521123106-84dde-2ad51d79df069cdba4102a4545640260bf5aa8b1.gz --- diff --git a/actions/newnotice.php b/actions/newnotice.php index f17ada3072..535b1a512d 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(); } @@ -60,7 +53,15 @@ class NewnoticeAction extends Action { return; } - return $notice->insert(); + $id = $notice->insert(); + + if ($id) { + common_broadcast_notices($id); + common_redirect(common_local_url('shownotice', + array('notice' => $id)), 303); + } else { + common_server_error(_t('Problem saving notice.')); + } } function show_form($msg=NULL) {