diff --git a/ChangeLog b/ChangeLog
index fadd7c1ff..ea2fc2101 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,7 @@ $Id$
 $Source$
 
 2001-12-03  Loïc Chapeaux  <lolo@phpheaven.net>
+	* tbl_select.php3: fixed bugs with text and time type fields.
 	* libraries/common.lib.php3, lines 583-585: fixed bug #488317 - 'only_db'
 	  problem with the 2.2.x.
 	* header.inc.php3; main.php3; lang/*: modified the way server informations
diff --git a/tbl_select.php3 b/tbl_select.php3
index db536a287..66524ce35 100755
--- a/tbl_select.php3
+++ b/tbl_select.php3
@@ -166,7 +166,8 @@ else {
                     $quot = '';
                     $cmp  = 'IS';
                 }
-                else if ($types[$i] == 'string' || $types[$i] == 'blob') {
+                else if (eregi('char|blob|text', $types[$i])
+                         || eregi('(set|enum)[(]', $types[$i])) {
                     $quot = '\'';
                     $cmp  = 'LIKE';
                     if (get_magic_quotes_gpc()) {
@@ -174,7 +175,7 @@ else {
                     }
                     $fields[$i]     = PMA_sqlAddslashes($fields[$i], TRUE);
                 }
-                else if ($types[$i] == 'date' || $types[$i] == 'time') {
+                else if (eregi('date|time|year', $types[$i])) {
                     $quot = '\'';
                     $cmp  = '=';
                 }