Merge branch 'wip-MDL-29086-MOODLE_21_STABLE' of git://github.com/abg…

…reeve/moodle into MOODLE_21_STABLE
moodle · Mar 8, 2012 · 4b3d540 · 4b3d540
2 parents 8cd16e9 + f123887
commit 4b3d540
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/mod/data/lib.php b/mod/data/lib.php
@@ -3117,13 +3117,15 @@ function data_extend_settings_navigation(settings_navigation $settings, navigati
  * @return bool
  */
 function data_presets_save($course, $cm, $data, $path) {
+    global $USER;
     $fs = get_file_storage();
     $filerecord = new stdClass;
     $filerecord->contextid = DATA_PRESET_CONTEXT;
     $filerecord->component = DATA_PRESET_COMPONENT;
     $filerecord->filearea = DATA_PRESET_FILEAREA;
     $filerecord->itemid = 0;
     $filerecord->filepath = '/'.$path.'/';
+    $filerecord->userid = $USER->id;
 
     $filerecord->filename = 'preset.xml';
     $fs->create_file_from_string($filerecord, data_presets_generate_xml($course, $cm, $data));

diff --git a/mod/data/preset.php b/mod/data/preset.php
@@ -183,8 +183,7 @@
                print_error('invalidrequest');
             }
 
-            $presetpath = data_preset_path($course, $userid, $shortname);
+            data_delete_site_preset($shortname);
-            fulldelete($presetpath);
 
             $strdeleted = get_string('deleted', 'data');
             echo $OUTPUT->notification("$shortname $strdeleted", 'notifysuccess');