patch #2242765 [core] Navi panel server links wrong

2008-11-21 17:57:32 +00:00
parent 5e88c70a15
commit c059601d6c
2 changed files with 7 additions and 1 deletions
--- a/libraries/url_generating.lib.php
+++ b/libraries/url_generating.lib.php
@@ -240,7 +240,9 @@ function PMA_generate_common_url()
    $separator = PMA_get_arg_separator();

    if (isset($GLOBALS['server'])
-      && $GLOBALS['server'] != $GLOBALS['cfg']['ServerDefault']) {
+        && $GLOBALS['server'] != $GLOBALS['cfg']['ServerDefault']
+            // avoid overwriting when creating navi panel links to servers
+        && ! isset($params['server'])) {
        $params['server'] = $GLOBALS['server'];
    }