From eda7a6b347f6eb855e2a4d7ecf610578b1356182 Mon Sep 17 00:00:00 2001
From: stronk7 <stronk7>
Date: Tue, 5 Feb 2008 20:31:59 +0000
Subject: [PATCH] Backported from HEAD. Some old backups can contain empties in
 user->picture, fix them before insert.

---
 backup/restorelib.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/backup/restorelib.php b/backup/restorelib.php
index d9e38473232..3ac5dfe7268 100644
--- a/backup/restorelib.php
+++ b/backup/restorelib.php
@@ -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;
                     }