diff --git a/ChangeLog b/ChangeLog
index 144ffa03a0..7e04c985c8 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@ phpMyAdmin - ChangeLog
 $Id$
 $Source$
 
+2006-06-30 Marc Delisle  <lem9@users.sourceforge.net>
+    * libraries/common.lib.php: escape also single quotes   
+
 2006-06-28 Marc Delisle  <lem9@users.sourceforge.net>
     * libraries/Config.class.php: remove debug code
     * libraries/common.lib.php: escape allowed parameters from non-token 
diff --git a/libraries/common.lib.php b/libraries/common.lib.php
index b59ec9ba96..5222433479 100644
--- a/libraries/common.lib.php
+++ b/libraries/common.lib.php
@@ -2810,7 +2810,7 @@ if (!isset($_REQUEST['token']) || $_SESSION['PMA_token'] != $_REQUEST['token'])
             unset($GLOBALS[$key]);
         } else {
             // allowed stuff could be compromised so escape it
-            $_REQUEST[$key] = htmlspecialchars($_REQUEST[$key]);
+            $_REQUEST[$key] = htmlspecialchars($_REQUEST[$key], ENT_QUOTES);
         }
     }
 }