From: Mikael Nordfeldth <mmn@hethane.se>
Date: Mon, 12 Jan 2015 11:13:34 +0000 (+0100)
Subject: newnotice action always returns the notice's URL
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=65c540478e8a1c8c14194add7835820b168ce6a5;p=quix0rs-gnu-social.git

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 a2e1aa24b2..ca770f38b6 100644
--- 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);
         }