Some old backups can contain empties in user->picture, fix them before insert. Merged...

diff --git a/backup/restorelib.php b/backup/restorelib.php
index 0c128bdd0e0dedf700938aa1132f047cf9fa172d..1ba2c3297ce7762762ace16b4a0ddfbb664ba981 100644 (file)
--- a/backup/restorelib.php
+++ b/backup/restorelib.php
@@ -2381,7 +2381,8 @@ define('RESTORE_GROUPS_GROUPINGS', 3);
                     // relink the descriptions
                     $user->description = stripslashes($user->description);
 
-                    if (!empty($CFG->disableuserimages)) {
+                /// Disable pictures based on global setting or existing empty value (old backups can contain wrong empties)
+                    if (!empty($CFG->disableuserimages) || empty($user->picture)) {
                         $user->picture = 0;
                     }