Merge branch 'w18_MDL-39374_m25_folderlog' of git://github.com/skodak…

…/moodle into MOODLE_25_STABLE
moodle · May 20, 2013 · e90eb09 · e90eb09
2 parents 5cc84ac + 2e29742
commit e90eb09
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/mod/folder/edit.php b/mod/folder/edit.php
@@ -39,8 +39,6 @@
 require_login($course, false, $cm);
 require_capability('mod/folder:managefiles', $context);
 
-add_to_log($course->id, 'folder', 'edit', 'edit.php?id='.$cm->id, $folder->id, $cm->id);
-
 $PAGE->set_url('/mod/folder/edit.php', array('id' => $cm->id));
 $PAGE->set_title($course->shortname.': '.$folder->name);
 $PAGE->set_heading($course->fullname);
@@ -64,6 +62,9 @@
 } else if ($formdata = $mform->get_data()) {
     $formdata = file_postupdate_standard_filemanager($formdata, 'files', $options, $context, 'mod_folder', 'content', 0);
     $DB->set_field('folder', 'revision', $folder->revision+1, array('id'=>$folder->id));
+
+    add_to_log($course->id, 'folder', 'edit', 'edit.php?id='.$cm->id, $folder->id, $cm->id);
+
     redirect($redirecturl);
 }