From afc5d44bed65aefb87a1c87b49a41ec8211cb4bc Mon Sep 17 00:00:00 2001 From: Sebastian Mendel Date: Thu, 18 Oct 2007 12:12:07 +0000 Subject: [PATCH] minor cosmetic changes --- libraries/common.inc.php | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/libraries/common.inc.php b/libraries/common.inc.php index 3ae1e9793..a7c120bbb 100644 --- a/libraries/common.inc.php +++ b/libraries/common.inc.php @@ -18,6 +18,8 @@ * - parsing of the configuration file * LABEL_loading_language_file * - loading language file + * LABEL_setup_servers + * - check and setup configured servers * LABEL_theme_setup * - setting up themes * @@ -411,11 +413,11 @@ if (! PMA_isValid($_REQUEST['token']) || $_SESSION[' PMA_token '] != $_REQUEST[' /** - * @global string $convcharset + * @global string $GLOBALS['convcharset'] * @see select_lang.lib.php */ if (isset($_REQUEST['convcharset'])) { - $convcharset = strip_tags($_REQUEST['convcharset']); + $GLOBALS['convcharset'] = strip_tags($_REQUEST['convcharset']); } /** @@ -570,6 +572,10 @@ if ($_SESSION['PMA_Config']->error_pma_uri) { trigger_error($strPmaUriError, E_USER_ERROR); } + +/******************************************************************************/ +/* setup servers LABEL_setup_servers */ + /** * current server * @global integer $GLOBALS['server']