From: tjhunt <tjhunt>
Date: Tue, 16 Oct 2007 14:03:23 +0000 (+0000)
Subject: Fix restore notice when a role has no capabilities. Merged from MOODLE_19_STABLE.
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=01b609d9fa0b420e8be5583bdc947609025e4ff3;p=moodle.git

Fix restore notice when a role has no capabilities. Merged from MOODLE_19_STABLE.
---

diff --git a/backup/restore_form.html b/backup/restore_form.html
index 5cb4a790f8..44ed7bf3d0 100644
--- a/backup/restore_form.html
+++ b/backup/restore_form.html
@@ -673,7 +673,8 @@ function restore_is_samerole($rolea, $roleb) {
     }
     
     foreach ($rolea as $cap) {
-        if ($cap->permission != $roleb->capabilities[$cap->capability]->permission) {
+        if (isset($roleb->capabilities[$cap->capability]) &&
+                $cap->permission != $roleb->capabilities[$cap->capability]->permission) {
             return false; 
         }     
     }