From c059601d6c99feb0740fe17d9d9ff63d1ee1a1e9 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Fri, 21 Nov 2008 17:57:32 +0000 Subject: [PATCH] patch #2242765 [core] Navi panel server links wrong --- ChangeLog | 4 ++++ libraries/url_generating.lib.php | 4 +++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 361612b5a..830ae634a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,6 +7,10 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA 3.2.0.0 (not yet released) +3.1.1.0 (not yet released) +- patch #2242765 [core] Navi panel server links wrong, + thanks to Martin Stricker - martinstricker + 3.1.0.0 (not yet released) + [auth] Support for Swekey hardware authentication - bug #2046883 [core] Notices about deprecated dl() (so stop using it) diff --git a/libraries/url_generating.lib.php b/libraries/url_generating.lib.php index 8521c6d6a..78c03dc49 100644 --- 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']; }