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

Disable UTF-8 if $cfg['AllowAnywhereRecoding'] has been set to FALSE.

Browse Source
This commit is contained in:
Alexander M. Turek
2002-07-17 10:26:27 +00:00
parent ccdd31ea5e
commit 56c7987b63
2 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@@ -10,6 +10,8 @@ $Source$
$cfg['PmaNoRelation_DisableWarning'] to the backwards compatibility code. $cfg['PmaNoRelation_DisableWarning'] to the backwards compatibility code.
* config.inc.php3, Documentation.html: Remerged the changes that were * config.inc.php3, Documentation.html: Remerged the changes that were
removed in the previous revision, thanks to Bj<42>rn T. Hallberg (bth). removed in the previous revision, thanks to Bj<42>rn T. Hallberg (bth).
* libraries/select_lang.lib.php3: Disable UTF-8 if
$cfg['AllowAnywhereRecoding'] has been set to FALSE.
2002-07-16 Mike Beck <mikebeck@users.sourceforge.net> 2002-07-16 Mike Beck <mikebeck@users.sourceforge.net>
* pdf_pages.php3: if a page is edit it can also be shown * pdf_pages.php3: if a page is edit it can also be shown

17
libraries/select_lang.lib.php3
View File

@@ -207,15 +207,28 @@ if (!isset($lang)) {
*/ */
// compatibility with config.inc.php3 <= v1.80 // compatibility with config.inc.php3 <= v1.80
if (isset($cfgLang)) { if (!isset($cfg['Lang']) && isset($cfgLang)) {
$cfg['Lang'] = $cfgLang; $cfg['Lang'] = $cfgLang;
unset($cfgLang); unset($cfgLang);
} }
if (isset($cfgDefaultLang)) { if (!isset($cfg['DefaultLang']) && isset($cfgDefaultLang)) {
$cfg['DefaultLang'] = $cfgDefaultLang; $cfg['DefaultLang'] = $cfgDefaultLang;
unset($cfgLang); unset($cfgLang);
} }
// Disable UTF-8 if $cfg['AllowAnywhereRecoding'] has been set to FALSE.
if (!isset($cfg['AllowAnywhereRecoding']) || !$cfg['AllowAnywhereRecoding']) {
$available_language_files = $available_languages;
$available_languages = array();
foreach ($available_language_files as $tmp_lang => $tmp_lang_data) {
if (substr($tmp_lang, -5) != 'utf-8') {
$available_languages[$tmp_lang] = $tmp_lang_data;
}
}
unset($tmp_lang);
unset($tmp_lang_data);
unset($available_language_files);
}
// Lang forced // Lang forced
if (!empty($cfg['Lang'])) { if (!empty($cfg['Lang'])) {