newnotice action always returns the notice's URL

Maybe could return conversation URL, but this will do for now.
Courtesy of the Javascript haters.

diff --git a/actions/newnotice.php b/actions/newnotice.php
index a2e1aa24b24346b0dc7f1de185a1d79cdf61ebcb..ca770f38b67a4a418e0d0f70de2646684640dbed 100644 (file)
--- a/actions/newnotice.php
+++ b/actions/newnotice.php
@@ -189,14 +189,7 @@ class NewnoticeAction extends FormAction
         Event::handle('EndSaveNewNoticeWeb', array($this, $user, &$content_shortened, &$options));
 
         if (!StatusNet::isAjax()) {
-            $returnto = $this->trimmed('returnto');
-
-            if ($returnto) {
-                $url = common_local_url($returnto,
-                                        array('nickname' => $this->scoped->getNickname()));
-            } else {
-                $url = common_local_url('shownotice', array('notice' => $this->stored->id));
-            }
+            $url = common_local_url('shownotice', array('notice' => $this->stored->id));
             common_redirect($url, 303);
         }