Changeset 3946:61ad7b88857b

Timestamp:

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

Author:

franck <carnet.franck.paul@…>

Branch:

default

Message:

Try to keep same context when switching blog

Location:

inc/admin

Files:

• lib.dc.page.php (modified) (1 diff)
• prepend.php (modified) (1 diff)

inc/admin/lib.dc.page.php

@@ -75 +75 @@
             $blog_box = '<p><label for="switchblog" class="classic">' . __('Blogs:') . '</label> ' .
             $core->formNonce() . form::combo('switchblog', $blogs, $core->blog->id) .
+            form::hidden(['redir'], $_SERVER['REQUEST_URI']) .
             '<input type="submit" value="' . __('ok') . '" class="hidden-if-js" /></p>';
         }

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;