Merge branch 'MDL-63916-35' of git://github.com/damyon/moodle into MOODLE_35_STABLE

2019-01-16 15:33:57 +01:00
parent b4ce080632 55a1e8b719
commit e618ee9fb5
1 changed files with 5 additions and 2 deletions
@@ -751,8 +751,11 @@ class backup_setting_ui_defaultcustom extends backup_setting_ui_text {
        if ($value === false) {
            $value = $this->attributes['defaultvalue'];
        }
-        if (!empty($value) && $this->attributes['type'] === 'date_selector') {
-            return userdate($value);
+        if (!empty($value)) {
+            if ($this->attributes['type'] === 'date_selector' ||
+                    $this->attributes['type'] === 'date_time_selector') {
+                return userdate($value);
+            }
        }
        return $value;
    }