Merge branch 'MDL-49473-master' of git://github.com/danpoltawski/moodle

2015-11-09 15:12:30 +08:00
parent 814809d59e 72ae4ec8d4
commit a2bb9b8751
1 changed files with 7 additions and 2 deletions
@@ -158,8 +158,13 @@ class report_log_table_log extends table_sql {
     * @return string HTML for the time column
     */
    public function col_time($event) {
-        $recenttimestr = get_string('strftimerecent', 'core_langconfig');
-        return userdate($event->timecreated, $recenttimestr);
+
+        if (empty($this->download)) {
+            $dateformat = get_string('strftimerecent', 'core_langconfig');
+        } else {
+            $dateformat = get_string('strftimedatetimeshort', 'core_langconfig');
+        }
+        return userdate($event->timecreated, $dateformat);
    }

    /**