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

Skip charset conversion code if input charset and output charset are the same.

Browse Source
This commit is contained in:
Alexander M. Turek
2004-01-06 21:49:42 +00:00
parent e1a7b0d74c
commit 72701d3a1a
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@@ -5,10 +5,14 @@ phpMyAdmin - Changelog
$Id$
$Source$
2004-01-06 Alexander M. Turek <therising@derrabus.de>
* libraries/charset_conversion.lib.php: Skip charset conversion code if
input charset and output charset are the same.
2004-01-05 Garvin Hicking <returnofthegarv@supergarv.de>
* browse_foreigners.php, tbl_change.php: Sort key/value pairs
as discussed in RFE #868369. Made foreigner window resizable.
* libraries/functions.js: Reverted row marker patch. See RFE #867284
* libraries/functions.js: Reverted row marker patch. See RFE #867284
for details.
* libraries/display_tbl.lib.php, libraries/display_tbl_links.lib.php,
libraries/functions.js: Upon clicking on a result row, de/activate

6
libraries/charset_conversion.lib.php
View File

@@ -138,7 +138,8 @@ if (isset($cfg['AllowAnywhereRecoding'])
function PMA_convert_display_charset($what) {
global $cfg, $allow_recoding, $charset, $convcharset;
if (!(isset($cfg['AllowAnywhereRecoding']) && $cfg['AllowAnywhereRecoding'] && $allow_recoding)) {
if (!(isset($cfg['AllowAnywhereRecoding']) && $cfg['AllowAnywhereRecoding'] && $allow_recoding)
|| $convcharset == $charset) { // rabus: if input and output charset are the same, we don't have to do anything...
return $what;
}
else if (is_array($what)) {
@@ -207,7 +208,8 @@ function PMA_convert_display_charset($what) {
function PMA_convert_charset($what) {
global $cfg, $allow_recoding, $charset, $convcharset;
if (!(isset($cfg['AllowAnywhereRecoding']) && $cfg['AllowAnywhereRecoding'] && $allow_recoding)) {
if (!(isset($cfg['AllowAnywhereRecoding']) && $cfg['AllowAnywhereRecoding'] && $allow_recoding)
|| $convcharset == $charset) { // rabus: if input and output charset are the same, we don't have to do anything...
return $what;
} else {
switch ($GLOBALS['PMA_recoding_engine']) {