Changeset 3946:61ad7b88857b for inc/admin/prepend.php

Timestamp:

12/17/18 11:57:14 (7 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Message:

Try to keep same context when switching blog

File:

• inc/admin/prepend.php (modified) (1 diff)

inc/admin/prepend.php

@@ -135 +135 @@
         }
 
-        # Removing switchblog from URL
-        $redir = $_SERVER['REQUEST_URI'];
-        $redir = preg_replace('/switchblog=(.*?)(&|$)/', '', $redir);
-        $redir = preg_replace('/\?$/', '', $redir);
+        if (!empty($_REQUEST['redir'])) {
+            # Keep context as far as possible
+            $redir = $_REQUEST['redir'];
+        } else {
+            # Removing switchblog from URL
+            $redir = $_SERVER['REQUEST_URI'];
+            $redir = preg_replace('/switchblog=(.*?)(&|$)/', '', $redir);
+            $redir = preg_replace('/\?$/', '', $redir);
+        }
         http::redirect($redir);
         exit;