And one more collection of innocent notices avoided. Bug 5712.

(http://moodle.org/bugs/bug.php?op=show&bugid=5712)

Merged from MOODLE_16_STABLE

diff --git a/backup/restore_check.html b/backup/restore_check.html
index ac9693da0c10fe43df561926a6e57776e4e2203a..992c8ba745cb81f58c7e7cef84121bff131b1055 100644 (file)
--- a/backup/restore_check.html
+++ b/backup/restore_check.html
@@ -45,7 +45,7 @@
                 $$var = optional_param( $var,0); 
                 $var = "restore_user_info_".$modname;
                 $$var = optional_param( $var,0);
-                $instances = $info->mods[$mod->name]->instances;
+                $instances = !empty($info->mods[$mod->name]->instances) ? $info->mods[$mod->name]->instances : NULL;
                 if ($instances === NULL) {
                     continue;
                 }
@@ -86,7 +86,7 @@
                 $restore->mods[$modname]->restore=$$var;
                 $var = "restore_user_info_".$modname;
                 $restore->mods[$modname]->userinfo=$$var;
-                $instances = $info->mods[$mod->name]->instances;
+                $instances = !empty($info->mods[$mod->name]->instances) ? $info->mods[$mod->name]->instances : NULL;
                 if ($instances === NULL) {
                     continue;
                 }