merged fix for restore support of user data from backups pre granular backup

diff --git a/backup/restorelib.php b/backup/restorelib.php
index 0b809e727f9256932b8f082acd74d8096b656605..60da142d17ec50b1c1ea98a5e441a549040de00e 100644 (file)
--- a/backup/restorelib.php
+++ b/backup/restorelib.php
@@ -5346,7 +5346,7 @@
      */
     function restore_userdata_selected($restore,$modname,$modid) {
         // check first for per instance array
-        if (!empty($restore->mods[$modname]->instances)) { // supports per instance
+        if (!empty($restore->mods[$modname]->granular)) { // supports per instance
             return array_key_exists($modid,$restore->mods[$modname]->instances) 
                 && !empty($restore->mods[$modname]->instances[$modid]->userinfo);
         }