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 5cb4a790f8dd0d6d980b8a02b099949b8683827e..44ed7bf3d0ae965e9423ddef4019b21e681706dc 100644 (file)
--- 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; 
         }     
     }