From ab82978b2d67545a9cd7bfc80837798212cff31b Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@controlyourself.ca>
Date: Thu, 5 Feb 2009 16:16:10 -0800
Subject: [PATCH] Trac #894 and #1013 - fixed bad redirects after delete notice

---
 actions/all.php           |  3 +++
 actions/deletenotice.php  |  4 ++++
 actions/favorited.php     |  3 +++
 actions/noticesearch.php  | 10 ++++++++++
 actions/public.php        |  3 +++
 actions/replies.php       |  2 ++
 actions/showfavorites.php |  2 ++
 actions/showgroup.php     |  2 ++
 actions/showstream.php    |  2 ++
 actions/tag.php           |  3 +++
 lib/mailbox.php           |  2 ++
 lib/personal.php          |  1 -
 12 files changed, 36 insertions(+), 1 deletion(-)

diff --git a/actions/all.php b/actions/all.php
index b03ad7ec36..d75d1b9461 100644
--- a/actions/all.php
+++ b/actions/all.php
@@ -42,6 +42,9 @@ class AllAction extends Action
         if (!$this->page) {
             $this->page = 1;
         }
+        
+        common_set_returnto($this->selfUrl());
+        
         return true;
     }
 
diff --git a/actions/deletenotice.php b/actions/deletenotice.php
index d4b8e50e5e..fc4a74eac9 100644
--- a/actions/deletenotice.php
+++ b/actions/deletenotice.php
@@ -134,6 +134,10 @@ class DeletenoticeAction extends DeleteAction
 
         $url = common_get_returnto();
 
+
+        $urlval = ($url) ? $url : 'null';
+        common_debug("deleteNotice() - returnto url = $urlval");  
+
         if ($url) {
             common_set_returnto(null);
         } else {
diff --git a/actions/favorited.php b/actions/favorited.php
index 4155b3a234..fd5ff413cb 100644
--- a/actions/favorited.php
+++ b/actions/favorited.php
@@ -104,6 +104,9 @@ class FavoritedAction extends Action
     {
         parent::prepare($args);
         $this->page = ($this->arg('page')) ? ($this->arg('page')+0) : 1;
+        
+        common_set_returnto($this->selfUrl());
+        
         return true;
     }
 
diff --git a/actions/noticesearch.php b/actions/noticesearch.php
index 630fb88574..c0c2381209 100644
--- a/actions/noticesearch.php
+++ b/actions/noticesearch.php
@@ -48,6 +48,16 @@ require_once INSTALLDIR.'/lib/searchaction.php';
  */
 class NoticesearchAction extends SearchAction
 {
+
+    function prepare($args)
+    {
+        parent::prepare($args);
+
+        common_set_returnto($this->selfUrl());
+
+        return true;
+    }
+    
     /**
      * Get instructions
      * 
diff --git a/actions/public.php b/actions/public.php
index cfdc99bb37..cc6537f74f 100644
--- a/actions/public.php
+++ b/actions/public.php
@@ -73,6 +73,9 @@ class PublicAction extends Action
     {
         parent::prepare($args);
         $this->page = ($this->arg('page')) ? ($this->arg('page')+0) : 1;
+        
+        common_set_returnto($this->selfUrl());
+        
         return true;
     }
 
diff --git a/actions/replies.php b/actions/replies.php
index 9ec373a96b..7eff74a669 100644
--- a/actions/replies.php
+++ b/actions/replies.php
@@ -83,6 +83,8 @@ class RepliesAction extends Action
 
         $this->page = ($this->arg('page')) ? ($this->arg('page')+0) : 1;
 
+        common_set_returnto($this->selfUrl());
+        
         return true;
     }
 
diff --git a/actions/showfavorites.php b/actions/showfavorites.php
index bb68f8d94f..31479e1a78 100644
--- a/actions/showfavorites.php
+++ b/actions/showfavorites.php
@@ -112,6 +112,8 @@ class ShowfavoritesAction extends Action
             $this->page = 1;
         }
 
+        common_set_returnto($this->selfUrl());
+        
         return true;
     }
 
diff --git a/actions/showgroup.php b/actions/showgroup.php
index 468990e7ba..7bc68fbc64 100644
--- a/actions/showgroup.php
+++ b/actions/showgroup.php
@@ -129,6 +129,8 @@ class ShowgroupAction extends Action
             return false;
         }
 
+        common_set_returnto($this->selfUrl());
+
         return true;
     }
 
diff --git a/actions/showstream.php b/actions/showstream.php
index 4b16799697..224bbce9fb 100644
--- a/actions/showstream.php
+++ b/actions/showstream.php
@@ -110,6 +110,8 @@ class ShowstreamAction extends Action
 
         $this->page = ($this->arg('page')) ? ($this->arg('page')+0) : 1;
 
+        common_set_returnto($this->selfUrl());
+        
         return true;
     }
 
diff --git a/actions/tag.php b/actions/tag.php
index 803026e624..4401f892a9 100644
--- a/actions/tag.php
+++ b/actions/tag.php
@@ -37,6 +37,9 @@ class TagAction extends Action
         }
 
         $this->page = ($this->arg('page')) ? ($this->arg('page')+0) : 1;
+        
+        common_set_returnto($this->selfUrl());
+        
         return true;
     }
 
diff --git a/lib/mailbox.php b/lib/mailbox.php
index 8d5d44e49d..e8323dc289 100644
--- a/lib/mailbox.php
+++ b/lib/mailbox.php
@@ -63,6 +63,8 @@ class MailboxAction extends PersonalAction
             $this->page = 1;
         }
 
+        common_set_returnto($this->selfUrl());
+
         return true;
     }
 
diff --git a/lib/personal.php b/lib/personal.php
index 900df0257f..e46350c630 100644
--- a/lib/personal.php
+++ b/lib/personal.php
@@ -55,7 +55,6 @@ class PersonalAction extends Action
     function handle($args)
     {
         parent::handle($args);
-        common_set_returnto($this->selfUrl());
     }
 
 }