Merge remote branch 'origin/master'

2011-01-13 22:40:10 +01:00 · 2011-01-13 22:40:10 +01:00 · 809e602f89
commit 809e602f89
parent a1fe2f26d0 d9f862a8c1
2 changed files with 2 additions and 2 deletions
--- a/tbl_change.php
+++ b/tbl_change.php
@ -986,7 +986,7 @@ $(function() {
        stepMinutes: 1,
        stepHours: 1,
        <?php echo ($field['pma_type'] == 'date' ? "showTime: false,":"showTime: true,"); ?>
-        dateFormat: 'yy-mm-dd',
+        dateFormat: 'yy-mm-dd', // yy means year with four digits
        altTimeField: '',
        constrainInput: false
     });
--- a/tbl_select.php
+++ b/tbl_select.php
@ -219,7 +219,7 @@ $(function() {
        stepMinutes: 1,
        stepHours: 1,
        <?php echo ($type == 'date' ? "showTime: false,":"showTime: true,"); ?>
-        dateFormat: 'yy-mm-dd',
+        dateFormat: 'yy-mm-dd', // yy means year with four digits
        altTimeField: '',
        constrainInput: false
     });