Merge branch 'MDL-28283-master' of git://github.com/ankitagarwal/moodle

This commit is contained in:
Sam Hemelryk
2012-02-14 13:57:30 +13:00
+2 -3
View File
@@ -53,7 +53,7 @@ class completion_criteria_date extends completion_criteria {
public function config_form_display(&$mform, $data = null)
{
$mform->addElement('checkbox', 'criteria_date', get_string('enable'));
$mform->addElement('date', 'criteria_date_value', get_string('afterspecifieddate', 'completion'));
$mform->addElement('date_selector', 'criteria_date_value', get_string('afterspecifieddate', 'completion'));
// If instance of criteria exists
if ($this->id) {
@@ -74,8 +74,7 @@ class completion_criteria_date extends completion_criteria {
if (!empty($data->criteria_date)) {
$this->course = $data->id;
$date = $data->criteria_date_value;
$this->timeend = strtotime($date['Y'].'-'.$date['M'].'-'.$date['d']);
$this->timeend = $data->criteria_date_value;
$this->insert();
}
}