diff --git a/ChangeLog b/ChangeLog index 9a87b3cdb..cc94addde 100755 --- a/ChangeLog +++ b/ChangeLog @@ -10,6 +10,7 @@ $Source$ 2002-07-05 Marc Delisle * Documentation.html: about html entities in translations + * common.lib.php: charset_conversion needs the constants 2002-07-01 Loïc Chapeaux * 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');