Merge branch 'MDL-36652' of https://github.com/rushi963/moodle

BenKelada · Mar 1, 2016 · 192bce5 · 192bce5
2 parents 6770a4b + 36a2d81
commit 192bce5
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/report/log/classes/renderable.php b/report/log/classes/renderable.php
@@ -487,6 +487,12 @@ public function setup_table() {
      */
     public function download() {
         $filename = 'logs_' . userdate(time(), get_string('backupnameformat', 'langconfig'), 99, false);
+        if ($this->course->id !== SITEID) {
+            $courseshortname = format_string($this->course->shortname, true,
+                    array('context' => context_course::instance($this->course->id)));
+            $filename = clean_filename('logs_' . $courseshortname . '_' . userdate(time(),
+                    get_string('backupnameformat', 'langconfig'), 99, false));
+        }
         $this->tablelog->is_downloading($this->logformat, $filename);
         $this->tablelog->out($this->perpage, false);
     }