From 0f629f73dced5e7bc395c7ef2cf8b546215094b5 Mon Sep 17 00:00:00 2001
From: "Alexander M. Turek" <me@derrabus.de>
Date: Thu, 18 Jul 2002 22:58:42 +0000
Subject: [PATCH] Exit the script if iconv cannot be used.

---
 ChangeLog                             | 2 ++
 libraries/charset_conversion.lib.php3 | 6 +++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 31ed74545..2a57897b1 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,8 @@ $Source$
 2002-07-18 Alexander M. Turek  <rabus@users.sourceforge.net>
     * libraries/common.lib.php3, libraries/select_lang.lib.php3: Don't include
       the "real" config file if a developer edition exists.
+    * libraries/charset_conversion.lib.php3: Exit the script if iconv cannot be
+      used.
 
 2002-07-18 Marc Delisle  <lem9@users.sourceforge.net>
     * libraries/display_tbl.lib.php3: bug 579785, Edit links URLs too long
diff --git a/libraries/charset_conversion.lib.php3 b/libraries/charset_conversion.lib.php3
index a7fc71495..5a90f5843 100644
--- a/libraries/charset_conversion.lib.php3
+++ b/libraries/charset_conversion.lib.php3
@@ -146,8 +146,12 @@ if (!defined('PMA_CHARSET_CONVERSION_LIB_INCLUDED')){
             } else if (@function_exists('recode_string')) {
                 return recode_string($charset . '..'  . $convcharset, $what);
             } else {
+                if (!isset($GLOBALS['is_header_sent'])) {
+                    require('./header.inc.php3');
+                }
                 echo $GLOBALS['strCantUseRecodeIconv'];
-                return $what;
+                require('./footer.inc.php3');
+                exit;
             }
         }
     } //  end of the "PMA_convert_charset()" function