--- course/modedit.php	2009-07-09 17:05:05.000000000 +0930
+++ course/modedit.php	2009-07-18 21:42:53.000000000 +0930
@@ -309,12 +309,6 @@
             if(!empty($CFG->enableavailability)) {
                 $cm->availablefrom             = $fromform->availablefrom;
                 $cm->availableuntil            = $fromform->availableuntil;
-                // The form time is midnight, but because we want it to be 
-                // inclusive, set it to 23:59:59 on that day.
-                if ($cm->availableuntil) {
-                    $cm->availableuntil = strtotime('23:59:59', 
-                        $cm->availableuntil);
-                }
                 $cm->showavailability          = $fromform->showavailability;
                 condition_info::update_cm_from_form($cm,$fromform,true);
             }
--- course/moodleform_mod.php	2009-07-17 13:10:40.000000000 +0930
+++ course/moodleform_mod.php	2009-07-18 18:03:39.000000000 +0930
@@ -373,9 +373,9 @@
         if (!empty($CFG->enableavailability)) {
             // Conditional availability
             $mform->addElement('header', '', get_string('availabilityconditions', 'condition'));
-            $mform->addElement('date_selector', 'availablefrom', get_string('availablefrom', 'condition'), array('optional'=>true));
+            $mform->addElement('date_time_selector', 'availablefrom', get_string('availablefrom', 'condition'), array('optional'=>true));
             $mform->setHelpButton('availablefrom', array('conditiondates', get_string('help_conditiondates', 'condition'), 'condition'));
-            $mform->addElement('date_selector', 'availableuntil', get_string('availableuntil', 'condition'), array('optional'=>true));
+            $mform->addElement('date_time_selector', 'availableuntil', get_string('availableuntil', 'condition'), array('optional'=>true));
             $mform->setHelpButton('availableuntil', array('conditiondates', get_string('help_conditiondates', 'condition'), 'condition'));
 
             // Conditions based on grades