MDL-32012 resource: flaw in restore from moodle 1.9 backups

2012-04-27 16:16:00 -04:00
parent aa753ac24f
commit 4eef1c2e14
1 changed files with 10 additions and 1 deletions
@@ -192,8 +192,17 @@ class moodle1_mod_resource_handler extends moodle1_mod_handler {
        }
        $this->fileman->filearea = 'content';
        $this->fileman->itemid   = 0;
+        
+        // Rebuild the file path.
+        $curfilepath = '/';
+        if ($reference) {
+            $curfilepath = pathinfo('/'.$reference, PATHINFO_DIRNAME);
+            if ($curfilepath != '/') {
+                $curfilepath .= '/';
+            }
+        }
        try {
-            $this->fileman->migrate_file('course_files/'.$reference, '/', null, 1);
+            $this->fileman->migrate_file('course_files/'.$reference, $curfilepath, null, 1);
        } catch (moodle1_convert_exception $e) {
            // the file probably does not exist
            $this->log('error migrating the resource main file', backup::LOG_WARNING, 'course_files/'.$reference);