From: stronk7 <stronk7>
Date: Thu, 19 Mar 2009 14:45:01 +0000 (+0000)
Subject: MDL-18594 restore check - skip maintenance.html file on restore of sie files. Credit... 
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=53dd63837de42c99d4239b235bd79eba6351ef76;p=moodle.git

MDL-18594 restore check - skip maintenance.html file on restore of sie files. Credit goes to Juan Segarra. Merged from 19_STABLE
---

diff --git a/backup/restorelib.php b/backup/restorelib.php
index cf4a1c45a9..b1899cf3a7 100644
--- a/backup/restorelib.php
+++ b/backup/restorelib.php
@@ -4051,6 +4051,10 @@ define('RESTORE_GROUPS_GROUPINGS', 3);
                 //Iterate
                 $counter = 0;
                 foreach ($list as $dir) {
+                    //Avoid copying maintenance.html. MDL-18594
+                    if ($dir == 'maintenance.html') {
+                       continue;
+                    }
                     //Copy the dir to its new location
                     //Only if destination file/dir doesn exists
                     if (!file_exists($dest_dir."/".$dir)) {