Changeset 12102

Timestamp:

Sep 8, 2011, 12:03:04 PM (13 years ago)

Author:

plg

Message:

bug 2434 fixed: try to stay on the same page when changing admin colors

File:

• trunk/admin.php (modified) (3 diffs)

trunk/admin.php

@@ -66 +66 @@
   conf_update_param('admin_theme', $new_admin_theme);
 
-  redirect('admin.php');
+  $url_params = array();
+  foreach (array('page', 'tab', 'section') as $url_param)
+  {
+    if (isset($_GET[$url_param]))
+    {
+      $url_params[] = $url_param.'='.$_GET[$url_param];
+    }
+  }
+  
+  $redirect_url = 'admin.php';
+  if (count($url_params) > 0)
+  {
+    $redirect_url.= '?'.implode('&', $url_params);
+  }
+
+  redirect($redirect_url);
 }
 
@@ -82 +97 @@
 // | Variables init                                                        |
 // +-----------------------------------------------------------------------+
+
+$change_theme_url = PHPWG_ROOT_PATH.'admin.php?';
+$test_get = $_GET;
+unset($test_get['page']);
+unset($test_get['section']);
+unset($test_get['tag']);
+if (count($test_get) == 0)
+{
+  $change_theme_url.= str_replace('&', '&', $_SERVER['QUERY_STRING']).'&';
+}
+$change_theme_url.= 'change_theme=1';
 
 // ?page=plugin-community-pendings is an clean alias of
@@ -162 +188 @@
     'U_PLUGINS'=> $link_start.'plugins',
     'U_ADD_PHOTOS' => $link_start.'photos_add',
-    'U_CHANGE_THEME' => PHPWG_ROOT_PATH.'admin.php?change_theme=1',
+    'U_CHANGE_THEME' => $change_theme_url,
     'U_PENDING_COMMENTS' => $link_start.'comments',
     'U_UPDATES' => $link_start.'updates',