Improve redirection when deleting an idle feed

1 files changed, 6 insertions, 3 deletions

diff --git a/app/Controllers/feedController.php b/app/Controllers/feedController.php
index 3326b2059..65d4b3a37 100755
--- a/app/Controllers/feedController.php
+++ b/app/Controllers/feedController.php
@@ -412,10 +412,13 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 
 			Minz_Session::_param ('notification', $notif);
 
-			if ($type == 'category') {
-				Minz_Request::forward (array ('c' => 'configure', 'a' => 'categorize'), true);
+			$redirect_url = Minz_Request::param('r', false, true);
+			if ($redirect_url) {
+				Minz_Request::forward($redirect_url);
+			} elseif ($type == 'category') {
+				Minz_Request::forward(array ('c' => 'configure', 'a' => 'categorize'), true);
 			} else {
-				Minz_Request::forward (array ('c' => 'configure', 'a' => 'feed'), true);
+				Minz_Request::forward(array ('c' => 'configure', 'a' => 'feed'), true);
 			}
 		}
 	}