correct field name

[quix0rs-gnu-social.git] / actions / newnotice.php

diff --git a/actions/newnotice.php b/actions/newnotice.php
index b65edf4c30596470d94bd1a47bbe9bdc5b01ad56..6d98c820cc46d4f8b40ef7d8376ea354175528a6 100644 (file)
--- a/actions/newnotice.php
+++ b/actions/newnotice.php
@@ -61,7 +61,7 @@ class NewnoticeAction extends Action {
                }
 
                $orig = clone($notice);
-               $notice->uri = common_mint_tag('notice:' . $id);
+               $notice->uri = common_notice_uri($notice);
                
                if (!$notice->update($orig)) {
                        common_server_error(_t('Problem saving notice.'));
@@ -69,16 +69,26 @@ class NewnoticeAction extends Action {
                }
                
                common_broadcast_notice($notice);
-               common_redirect(common_local_url('shownotice',
-                                                                                array('notice' => $id)), 303);
+               $returnto = $this->trimmed('returnto');
+               if ($returnto) {
+                       $url = common_local_url($returnto,
+                                                                       array('nickname' => $user->nickname));
+               } else {
+                       $url = common_local_url('shownotice',
+                                                                       array('notice' => $id));
+               }
+               common_redirect($url, 303);
        }
 
-       function show_form($msg=NULL) {
-               common_show_header(_t('New notice'));
+       function show_top($msg=NULL) {
                if ($msg) {
                        common_element('div', 'error', $msg);
                }
+       }
+       
+       function show_form($msg=NULL) {
+               common_show_header(_t('New notice'), NULL, $msg, array($this, 'show_top'));
                common_notice_form();
                common_show_footer();
        }
-}
\ No newline at end of file
+}