diff --git a/ChangeLog b/ChangeLog
index 116d561db..cb9bf797c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,10 @@ phpMyAdmin - ChangeLog
 $Id$
 $HeadURL$
 
+2006-10-19 Marc Delisle  <lem9@users.sourceforge.net>
+    * libraries/common.lib.php, /database_interface.lib.php,/session.inc.php:
+      wrong parameter "char" when calling error.php, should be "charset"
+
 2006-10-19 Michal Čihař  <michal@cihar.com>
     * db_import.php, db_details.php, db_details_export.php,
       db_details_structure.php, db_details_qbe.php, db_operations.php,
diff --git a/libraries/common.lib.php b/libraries/common.lib.php
index 28825b1ec..53b5f1772 100644
--- a/libraries/common.lib.php
+++ b/libraries/common.lib.php
@@ -2753,7 +2753,7 @@ if (empty($_SESSION['PMA_Config'])) {
     if (!function_exists('preg_replace')) {
         header('Location: error.php'
             . '?lang='  . urlencode($available_languages[$lang][2])
-            . '&char='  . urlencode($charset)
+            . '&charset='  . urlencode($charset)
             . '&dir='   . urlencode($text_dir)
             . '&type='  . urlencode($strError)
             . '&error=' . urlencode(
@@ -3010,7 +3010,7 @@ if (! defined('PMA_MINIMUM_COMMON')) {
         if (!file_exists('./libraries/auth/' . $cfg['Server']['auth_type'] . '.auth.lib.php')) {
             header('Location: error.php'
                     . '?lang='  . urlencode($available_languages[$lang][2])
-                    . '&char='  . urlencode($charset)
+                    . '&charset='  . urlencode($charset)
                     . '&dir='   . urlencode($text_dir)
                     . '&type='  . urlencode($strError)
                     . '&error=' . urlencode(
diff --git a/libraries/database_interface.lib.php b/libraries/database_interface.lib.php
index 157c917aa..ddd850b53 100644
--- a/libraries/database_interface.lib.php
+++ b/libraries/database_interface.lib.php
@@ -58,7 +58,7 @@ if ( ! PMA_DBI_checkAndLoadMysqlExtension( $GLOBALS['cfg']['Server']['extension'
         // if alternativ fails too ...
         header( 'Location: error.php'
                 . '?lang='  . urlencode( $available_languages[$lang][2] )
-                . '&char='  . urlencode( $charset )
+                . '&charset='  . urlencode( $charset )
                 . '&dir='   . urlencode( $text_dir )
                 . '&type='  . urlencode( $strError )
                 . '&error=' . urlencode(
diff --git a/libraries/session.inc.php b/libraries/session.inc.php
index 14294c648..965f26614 100644
--- a/libraries/session.inc.php
+++ b/libraries/session.inc.php
@@ -25,7 +25,7 @@ if (!@function_exists('session_name')) {
     // (do not use &amp; for parameters sent by header)
     header('Location: error.php'
             . '?lang='  . urlencode($available_languages[$lang][2])
-            . '&char='  . urlencode($charset)
+            . '&charset='  . urlencode($charset)
             . '&dir='   . urlencode($text_dir)
             . '&type='  . urlencode($strError)
             . '&error=' . urlencode(sprintf($strCantLoad, 'session')));