From 30c6f6f58bd7f60cd137e28a7d3c32a8f8158e20 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <michal@cihar.com>
Date: Mon, 7 Jun 2004 13:24:35 +0000
Subject: [PATCH] Do not convert, if charsets are same.

---
 ChangeLog                            | 2 ++
 libraries/charset_conversion.lib.php | 1 +
 2 files changed, 3 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 48e2227a8..6575b6bdd 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,6 +11,8 @@ $Source$
 
 2004-06-07 Michal Čihař  <michal@cihar.com>
     * lang/czech: Updated.
+    * libraries/charset_conversion.lib.php: Do not convert, if charsets are
+      same.
 
 2004-06-07 Alexander M. Turek  <me@derrabus.de>
     * css/phpmyadmin.css.php: beautifications.
diff --git a/libraries/charset_conversion.lib.php b/libraries/charset_conversion.lib.php
index 8c06146fb..93ee46fad 100644
--- a/libraries/charset_conversion.lib.php
+++ b/libraries/charset_conversion.lib.php
@@ -240,6 +240,7 @@ function PMA_convert_charset($what) {
  * @author  nijel
  */
 function PMA_convert_string($src_charset, $dest_charset, $what) {
+    if ($src_charset == $dest_charset) return $what;
     switch ($GLOBALS['PMA_recoding_engine']) {
         case PMA_CHARSET_RECODE:
             return recode_string($src_charset . '..'  . $dest_charset, $what);