diff --git a/ChangeLog b/ChangeLog
index 8fdc77395..604d4ce6b 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2004-04-18 Michal Cihar  <michal@cihar.com>
+    * libraries/tbl_change.js: Fixed caledar behavior for DATE fields.
+
 2004-04-18 Alexander M. Turek  <me@derrabus.de>
     * lang/german-*.inc.php: Updates.
 
diff --git a/libraries/tbl_change.js b/libraries/tbl_change.js
index ec92a208b..014556272 100644
--- a/libraries/tbl_change.js
+++ b/libraries/tbl_change.js
@@ -138,7 +138,7 @@ function initCalendar() {
         /* Called for first time */
         if (window.opener.dateField.value) {
             value = window.opener.dateField.value;
-            if (window.opener.type == 'date') {
+            if (window.opener.dateType == 'date') {
                 date = value.split("-");
                 day = parseInt(date[2]);
                 month = parseInt(date[1]) - 1;
@@ -195,7 +195,7 @@ function initCalendar() {
 			dayInWeek = 0;
 		}
         dispmonth = 1 + month;
-        if (window.opener.type == 'date') {
+        if (window.opener.dateType == 'date') {
 		    actVal = year + "-" + dispmonth + "-" + i;
         } else {
 		    actVal = "" + (year < 1000 ? year < 100 ? year < 10 ? '000' : '00' : '0' : '') + year + (dispmonth < 10 ? '0' : '') + dispmonth + (i < 10 ? '0' : '') + i;