From 491c8cfabcb3d54f31c1c6f3a450a85715072adf Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Fri, 5 Jul 2002 19:54:05 +0000
Subject: [PATCH] charset_conversion needs the constants

---
 ChangeLog                 |  1 +
 libraries/common.lib.php3 | 10 +++++-----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 9a87b3cdb..cc94addde 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,6 +10,7 @@ $Source$
 
 2002-07-05 Marc Delisle  <lem9@users.sourceforge.net>
     * Documentation.html: about html entities in translations
+    * common.lib.php: charset_conversion needs the constants
 
 2002-07-01 Loïc Chapeaux  <lolo@phpheaven.net>
     * Documentation.html: coding standards and xhtml fixes.
diff --git a/libraries/common.lib.php3 b/libraries/common.lib.php3
index 838a89474..bc12493e4 100644
--- a/libraries/common.lib.php3
+++ b/libraries/common.lib.php3
@@ -121,11 +121,6 @@ h1    {font-family: sans-serif; font-size: large; font-weight: bold}
      */
     include('./libraries/mysql_wrappers.lib.php3');
 
-    /**
-     * Include charset conversion.
-     */
-    include('./libraries/charset_conversion.lib.php3');
-
     /**
      * Gets constants that defines the PHP, MySQL... releases.
      * This include must be located physically before any code that needs to
@@ -135,6 +130,11 @@ h1    {font-family: sans-serif; font-size: large; font-weight: bold}
      */
     include('./libraries/defines.lib.php3');
 
+    /**
+     * Include charset conversion.
+     */
+    include('./libraries/charset_conversion.lib.php3');
+
     // For compatibility with old config.inc.php3
     if (!isset($cfg['FileRevision']) || (int)substr($cfg['FileRevision'],13,3) < 116) {
         include('./libraries/config_import.lib.php3');