From b0cb12ac93508de1af5fb0126403dab147f7bcce Mon Sep 17 00:00:00 2001
From: toyomoyo <toyomoyo>
Date: Tue, 20 Feb 2007 01:07:18 +0000
Subject: [PATCH] merged, apply nick's patch for MDL-8534, typo in
 restorelib.php

---
 backup/restorelib.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/backup/restorelib.php b/backup/restorelib.php
index 86ec7ef8f2..1d0c0216af 100644
--- 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
+?>
-- 
2.39.5