From f1a266c778bc16d41d3f307e1d44f1080302b467 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Fri, 26 Oct 2007 17:08:12 +0000 Subject: [PATCH] fix multi-server login bug introduced in revision 10855; ensure that the new _form_params are really used by the called function; missing doc for PMA_generate_common_hidden_inputs() --- libraries/auth/cookie.auth.lib.php | 4 +++- libraries/url_generating.lib.php | 3 +++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/libraries/auth/cookie.auth.lib.php b/libraries/auth/cookie.auth.lib.php index 59dea2f91..932838580 100644 --- a/libraries/auth/cookie.auth.lib.php +++ b/libraries/auth/cookie.auth.lib.php @@ -284,7 +284,9 @@ if (top != self) { if (! empty($GLOBALS['table'])) { $_form_params['table'] = $GLOBALS['table']; } - echo PMA_generate_common_hidden_inputs(); + // do not generate a "server" hidden field as we want the "server" + // drop-down to have priority + echo PMA_generate_common_hidden_inputs($_form_params, '', 0, 'server'); ?> diff --git a/libraries/url_generating.lib.php b/libraries/url_generating.lib.php index ac4c3e738..7c5a3abfd 100644 --- a/libraries/url_generating.lib.php +++ b/libraries/url_generating.lib.php @@ -12,8 +12,11 @@ * @see PMA_generate_common_url() * @uses PMA_getHiddenFields * @param string optional database name + * (can also be an array of parameters) * @param string optional table name * @param int indenting level + * @param string do not generate a hidden field for this parameter + * (can be an array of strings) * * @return string string with input fields *