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

minor cosmetic changes

Browse Source
This commit is contained in:
Sebastian Mendel
2007-10-18 12:12:07 +00:00
parent 62ee5d8491
commit afc5d44bed
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
libraries/common.inc.php
View File

@@ -18,6 +18,8 @@
* - parsing of the configuration file * - parsing of the configuration file
* LABEL_loading_language_file * LABEL_loading_language_file
* - loading language file * - loading language file
* LABEL_setup_servers
* - check and setup configured servers
* LABEL_theme_setup * LABEL_theme_setup
* - setting up themes * - 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 * @see select_lang.lib.php
*/ */
if (isset($_REQUEST['convcharset'])) { 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); trigger_error($strPmaUriError, E_USER_ERROR);
} }
/******************************************************************************/
/* setup servers LABEL_setup_servers */
/** /**
* current server * current server
* @global integer $GLOBALS['server'] * @global integer $GLOBALS['server']