From efc4f5a9bac3ba1086afac4f3693e02a1ce078b2 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Michal=20=C4=8Ciha=C5=99?= Date: Mon, 2 Jun 2008 13:20:00 +0000 Subject: [PATCH] Translation is already loaded by libraries/select_lang.lib.php. --- libraries/common.inc.php | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/libraries/common.inc.php b/libraries/common.inc.php index fde9f71e08..3305b4d9e6 100644 --- a/libraries/common.inc.php +++ b/libraries/common.inc.php @@ -227,7 +227,7 @@ if (isset($_POST['usesubform'])) { } else { // Note: here we overwrite $_REQUEST so that it does not contain cookies, // because another application for the same domain could have set - // a cookie (with a compatible path) that overrides a variable + // a cookie (with a compatible path) that overrides a variable // we expect from GET or POST. // We'll refer to cookies explicitly with the $_COOKIE syntax. $_REQUEST = array_merge($_GET, $_POST); @@ -557,9 +557,6 @@ if (file_exists('./lang/added_messages.php')) { */ require_once './libraries/select_lang.lib.php'; -// Load the translation -require_once $lang_path . $available_languages[$GLOBALS['lang']][1] . '.inc.php'; - /** * check for errors occurred while loading configuration * this check is done here after loading language files to present errors in locale @@ -911,7 +908,7 @@ if (! defined('PMA_MINIMUM_COMMON')) { $pma = new PMA; $pma->userlink = $userlink; $pma->controllink = $controllink; - + /** * some resetting has to be done when switching servers */ -- 2.11.4.GIT