From 2ec27507528ace707b74d8ebd53a4f5c9c6b8ab2 Mon Sep 17 00:00:00 2001
From: Dries Buytaert <dries@buytaert.net>
Date: Wed, 27 Jan 2010 18:56:19 +0000
Subject: [PATCH] - Patch #563106 by int: more upgrade path fixing.
---
modules/user/user.install | 43 +++++++++++++++++++--------------------
1 file changed, 21 insertions(+), 22 deletions(-)
diff --git a/modules/user/user.install b/modules/user/user.install
index 141e7c266a1b..d3d6f095a120 100644
--- a/modules/user/user.install
+++ b/modules/user/user.install
@@ -436,30 +436,29 @@ function user_update_7004(&$sandbox) {
$result = db_query_range("SELECT uid, picture FROM {users} WHERE picture <> '' AND uid > :uid ORDER BY uid", 0, $limit, array(':uid' => $sandbox['last_user_processed']));
foreach ($result as $user) {
// Don't bother adding files that don't exist.
- if (!file_exists($user->picture)) {
- continue;
- }
+ if (file_exists($user->picture)) {
- // Check if the file already exists.
- $files = file_load_multiple(array(), array('uri' => $user->picture));
- if (count($files)) {
- $file = reset($files);
- }
- else {
- // Create a file object.
- $file = new stdClass();
- $file->uri = $user->picture;
- $file->filename = basename($file->uri);
- $file->filemime = file_get_mimetype($file->uri);
- $file->uid = $user->uid;
- $file->status = FILE_STATUS_PERMANENT;
- $file = file_save($file);
- }
+ // Check if the file already exists.
+ $files = file_load_multiple(array(), array('uri' => $user->picture));
+ if (count($files)) {
+ $file = reset($files);
+ }
+ else {
+ // Create a file object.
+ $file = new stdClass();
+ $file->uri = $user->picture;
+ $file->filename = basename($file->uri);
+ $file->filemime = file_get_mimetype($file->uri);
+ $file->uid = $user->uid;
+ $file->status = FILE_STATUS_PERMANENT;
+ $file = file_save($file);
+ }
- db_update('users')
- ->fields(array('picture_fid' => $file->fid))
- ->condition('uid', $user->uid)
- ->execute();
+ db_update('users')
+ ->fields(array('picture_fid' => $file->fid))
+ ->condition('uid', $user->uid)
+ ->execute();
+ }
// Update our progress information for the batch update.
$sandbox['progress']++;
--
GitLab