fixed recursive backing up of backup folder when resource diretory reference is cours...

diff --git a/mod/resource/backuplib.php b/mod/resource/backuplib.php
index 846c547fde1829bc51359e1d48f68a3d8f05dc59..14d8e288e05b5edbddcc9a466ac387ddf849e584 100644 (file)
--- a/mod/resource/backuplib.php
+++ b/mod/resource/backuplib.php
@@ -145,10 +145,16 @@
             $newbit .= $bits[$i].'/';
             $status = $status && check_dir_exists($CFG->dataroot.'/temp/backup/'.$preferences->backup_unique_code.'/course_files/'.$newbit,true);
         }
-        
-        $status = $status && backup_copy_file($CFG->dataroot."/".$preferences->backup_course."/".$resource->reference,
-                                              $CFG->dataroot."/temp/backup/".$preferences->backup_unique_code."/course_files/".$resource->reference);
 
+        if ($resource->reference === '') {
+            $status = $status && backup_copy_course_files($preferences); // copy while ignoring backupdata and moddata!!!
+        } else if (strpos($resource->reference, 'backupdata') === 0 or strpos($resource->reference, $CFG->moddata) === 0) {
+            // no copying - these directories must not be shared anyway!
+        } else {
+            $status = $status && backup_copy_file($CFG->dataroot."/".$preferences->backup_course."/".$resource->reference,
+                                                  $CFG->dataroot."/temp/backup/".$preferences->backup_unique_code."/course_files/".$resource->reference);
+        }
+         
         // now, just in case we check moddata ( going forwards, resources should use this )
         $status = $status && check_and_create_moddata_dir($preferences->backup_unique_code);
         $status = $status && check_dir_exists($CFG->dataroot."/temp/backup/".$preferences->backup_unique_code."/".$CFG->moddata."/resource/",true);