diff --git a/ChangeLog b/ChangeLog
index 0866e36c5..28c424e8b 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@ phpMyAdmin - Changelog
 $Id$ 
 $Source$
 
+2001-06-05  Marc Delisle  <lem9@users.sourceforge.net>
+        * tbl_properties, tbl_printview: quote Comment field
+
 2001-06-04  Marc Delisle  <lem9@users.sourceforge.net>
         * tbl_change, tbl_replace: SaveAsNewRow
 
diff --git a/tbl_printview.php3 b/tbl_printview.php3
index c9b7086c1..6a34a7bc2 100755
--- a/tbl_printview.php3
+++ b/tbl_printview.php3
@@ -22,7 +22,7 @@ if(MYSQL_MAJOR_VERSION == "3.23")
     $row = mysql_fetch_array($result);
     if(!empty($row["Comment"]))
     {
-        echo "$strTableComments: $row[Comment]";
+        echo "$strTableComments: " . $row['Comment'];
     }
 }
 
diff --git a/tbl_properties.php3 b/tbl_properties.php3
index c34a07c2a..c00135b2c 100755
--- a/tbl_properties.php3
+++ b/tbl_properties.php3
@@ -31,7 +31,7 @@ if(MYSQL_MAJOR_VERSION == "3.23")
     <input type="hidden" name="db" value="<?php echo $db;?>">
     <input type="hidden" name="table" value="<?php echo $table;?>">
     <?php
-    echo "$strTableComments: <input type='text' name='comment' value='$row[Comment]'><input type='submit' name='submitcomment' value='$strGo'></form>";
+    echo "$strTableComments: <input type='text' name='comment' value='" . $row['Comment'] . "'><input type='submit' name='submitcomment' value='$strGo'></form>";
 
     //BEGIN - Table Type - 2 May 2001 - Robbat2
     if(isset($submittype))