summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvan Prodromou <evan@prodromou.name>2008-05-21 08:31:06 -0400
committerEvan Prodromou <evan@prodromou.name>2008-05-21 08:31:06 -0400
commit55fdd0b981c0a429186eda6f8d95b06f67eade76 (patch)
tree3f715a3a09b7bb972742d188b6dd67dcecdb5311
parent659feb5f43a1bd75b385fa2c96b568b71d2bcd96 (diff)
move error display to save_new_notice
darcs-hash:20080521123106-84dde-2ad51d79df069cdba4102a4545640260bf5aa8b1.gz
-rw-r--r--actions/newnotice.php19
1 files changed, 10 insertions, 9 deletions
diff --git a/actions/newnotice.php b/actions/newnotice.php
index f17ada307..535b1a512 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) {