From: skodak <skodak>
Date: Sat, 16 Sep 2006 18:15:40 +0000 (+0000)
Subject: fixed recursive backing up of backup folder when resource diretory reference is cours... 
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=0d5a9a94c157288cce43b005f9df2e979391ac79;p=moodle.git

fixed recursive backing up of backup folder when resource diretory reference is course files root - MDL-6280 ; merged from MOODLE_16_STABLE
---

diff --git a/mod/resource/backuplib.php b/mod/resource/backuplib.php
index 846c547fde..14d8e288e0 100644
--- 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);