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

2008-02-05 20:31:59 +00:00
parent 5d4b57cb07
commit eda7a6b347
1 changed files with 2 additions and 1 deletions
@@ -1613,7 +1613,8 @@
                    // relink the descriptions
                    $user->description = restore_decode_absolute_links($user->description);

-                    if (!empty($CFG->disableuserimages)) {
+                /// Disable pictures based on global setting of existing empty value (old backups can contain wrong empties)
+                    if (!empty($CFG->disableuserimages) || empty($user->picture)) {
                        $user->picture = 0;
                    }