diff --git a/ChangeLog b/ChangeLog
index e09179367..d90612bfb 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,12 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2002-07-25 Marc Delisle  <lem9@users.sourceforge.net>
+    * Documentation.html, clarify about mysql extensions
+    * tbl_properties_options.php3, tbl_properties_table_info.php3:
+      bug 586230, thanks to Loïc
+    * common.lib.php3: fix bad variable name
+
 2002-07-25 Loïc Chapeaux  <lolo@phpheaven.net>
     * coding standard: common.lib.php3, config.inc.php3, Documentation.html,
       header.inc.php3, sqlparser.data.php3, sqlparser.lib.php3,
diff --git a/tbl_properties_options.php3 b/tbl_properties_options.php3
index 027784730..792630767 100755
--- a/tbl_properties_options.php3
+++ b/tbl_properties_options.php3
@@ -65,7 +65,7 @@ if (PMA_MYSQL_INT_VERSION >= 32322) {
             <input type="hidden" name="table" value="<?php echo $table; ?>" />
             <?php echo $strTableComments; ?>&nbsp;:&nbsp;
             <input type="hidden" name="prev_comment" value="<?php echo urlencode($show_comment); ?>" />&nbsp;
-            <input type="text" name="comment" maxlength="60" size="30" value="<?php echo str_replace('"', '&quot;', $show_comment); ?>" class="textfield" style="vertical-align: middle" onfocus="this.select()" />&nbsp;
+            <input type="text" name="comment" maxlength="60" size="30" value="<?php echo htmlspecialchars($show_comment); ?>" class="textfield" style="vertical-align: middle" onfocus="this.select()" />&nbsp;
             <input type="submit" name="submitcomment" value="<?php echo $strGo; ?>" style="vertical-align: middle" />
         </form>
     </li>