diff --git a/ChangeLog b/ChangeLog
index 4e07765de..f68f01de3 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2005-12-17 Marc Delisle  <lem9@users.sourceforge.net>
+    * libraries/url_generating.lib.php: problem with accented table names
+
 2005-12-16 Michal Čihař  <michal@cihar.com>
     * Documentation.html, libraries/common.lib.php,
       libraries/config.default.php, libraries/database_interface.lib.php: Add
diff --git a/libraries/url_generating.lib.php b/libraries/url_generating.lib.php
index 6ea2b4017..2d5886e77 100644
--- a/libraries/url_generating.lib.php
+++ b/libraries/url_generating.lib.php
@@ -76,7 +76,7 @@ function PMA_generate_common_hidden_inputs( $db = '', $table = '', $indent = 0,
 
     $return = '';
     foreach( $params as $key => $val ) {
-        $return .= $spaces . '<input type="hidden" name="' . htmlentities( $key ) . '" value="' . htmlentities( $val ) . '" />' . "\n";
+        $return .= $spaces . '<input type="hidden" name="' . htmlspecialchars( $key ) . '" value="' . htmlspecialchars( $val ) . '" />' . "\n";
     }
 
     return $return;