nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

patch #2242765 [core] Navi panel server links wrong

Browse Source
This commit is contained in:
Marc Delisle
2008-11-21 17:57:32 +00:00
parent a0711132f6
commit f6a187d539
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@@ -6,6 +6,8 @@ $Id$
$HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyAdmin/ChangeLog $ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyAdmin/ChangeLog $
3.1.1.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) 3.1.0.0 (not yet released)
+ [auth] Support for Swekey hardware authentication + [auth] Support for Swekey hardware authentication

4
libraries/url_generating.lib.php
View File

@@ -240,7 +240,9 @@ function PMA_generate_common_url()
$separator = PMA_get_arg_separator(); $separator = PMA_get_arg_separator();
if (isset($GLOBALS['server']) 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']; $params['server'] = $GLOBALS['server'];
} }