merged, apply nick's patch for MDL-8534, typo in restorelib.php

diff --git a/backup/restorelib.php b/backup/restorelib.php
index 86ec7ef8f28bc16dad9a99bef806d5e5d0a59472..1d0c0216af66ca24bab1fcecf848d18a948ba17b 100644 (file)
--- a/backup/restorelib.php
+++ b/backup/restorelib.php
@@ -4696,7 +4696,7 @@
                             break;
                     }
                 }
-                if ($this->level == 6 && $this->tree[5]!="ROLE_ASSIGNMENTS" && $this->tree[5]!="ROLE_OVERRIDES") {
+                if ($this->level == 6 && $this->tree[5]!="ROLES_ASSIGNMENTS" && $this->tree[5]!="ROLES_OVERRIDES") {
                     switch ($tagName) {
                         case "ROLE":
                             //We've finalized a role, get it
@@ -4711,7 +4711,7 @@
                     }
                 }
                               
-                if ($this->level == 7 && $this->tree[5]!="ROLE_ASSIGNMENTS" && $this->tree[5]!="ROLE_OVERRIDES") {
+                if ($this->level == 7) {
                     switch ($tagName) {
                         case "TYPE":
                             $this->info->temprole->type = $this->getContents();
@@ -6743,4 +6743,4 @@
            fclose($restorelog); 
         }
     }
-?>
\ No newline at end of file
+?>