diff --git a/ChangeLog b/ChangeLog
index 632a1d56f..26dfbaa8d 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2005-11-24 Sebastian Mendel <cybot_tm@users.sourceforge.net>
+    * libraries/url_generating.lib.php: do not htmlentities on whole string
+
 2005-11-25 Michal Čihař  <michal@cihar.com>
     * Documentation.html, config.footer.inc.php(deleted),
       config.header.inc.php(deleted), libraries/common.lib.php,
diff --git a/libraries/url_generating.lib.php b/libraries/url_generating.lib.php
index 36c262bc0..5ce22bc2d 100644
--- a/libraries/url_generating.lib.php
+++ b/libraries/url_generating.lib.php
@@ -174,7 +174,7 @@ function PMA_generate_common_url ($db = '', $table = '', $delim = '&amp;')
         return '';
     }
 
-    return htmlentities( $questionmark . implode( $delim, $param_strings ) );
+    return $questionmark . implode( $delim, $param_strings );
 }
 
 ?>