merged, getting rid of warnings

diff --git a/backup/restorelib.php b/backup/restorelib.php
index 9fbb8d2ec2b93198c02f7d872a79c45273125a3f..d67b2de57962285ca7a035a3411cc7fd1406ce10 100644 (file)
--- a/backup/restorelib.php
+++ b/backup/restorelib.php
@@ -365,7 +365,7 @@
                     } else {
                         $tab[$elem][1] = get_string("included")." ".get_string("withoutuserdata");
                     }
-                    if (is_array($mod->instances) && count($mod->instances)) {
+                    if (isset($mod->instances) && is_array($mod->instances) && count($mod->instances)) {
                         foreach ($mod->instances as $instance) {
                             if ($instance->backup) {
                                 $elem++;