diff options
| author | Dries Buytaert <dries@buytaert.net> | 2010-07-26 03:04:29 +0000 |
|---|---|---|
| committer | Dries Buytaert <dries@buytaert.net> | 2010-07-26 03:04:29 +0000 |
| commit | 57e88bff51385826190dd30066c704391dbc9b3b (patch) | |
| tree | 86c78ca0d1eaee22cabf7f01bc9525d43745c483 /modules/user | |
| parent | 1236ee9c75a650b2c022bfe498246c034619025c (diff) | |
| download | brdo-57e88bff51385826190dd30066c704391dbc9b3b.tar.gz brdo-57e88bff51385826190dd30066c704391dbc9b3b.tar.bz2 | |
- Patch #809600 by Damien Tournoud, chx: stop using bit-wise operators for {file_managed()}.status.
Diffstat (limited to 'modules/user')
| -rw-r--r-- | modules/user/user.module | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/user/user.module b/modules/user/user.module index d5f97c99e..8e5e8f8d6 100644 --- a/modules/user/user.module +++ b/modules/user/user.module @@ -431,7 +431,7 @@ function user_save($account, $edit = array(), $category = 'account') { $picture = $edit['picture']; // If the picture is a temporary file move it to its final location and // make it permanent. - if (($picture->status & FILE_STATUS_PERMANENT) == 0) { + if (!$picture->status) { $info = image_get_info($picture->uri); $picture_directory = variable_get('file_default_scheme', 'public') . '://' . variable_get('user_picture_path', 'pictures'); @@ -440,7 +440,7 @@ function user_save($account, $edit = array(), $category = 'account') { $destination = file_stream_wrapper_uri_normalize($picture_directory . '/picture-' . $account->uid . '-' . REQUEST_TIME . '.' . $info['extension']); if ($picture = file_move($picture, $destination, FILE_EXISTS_RENAME)) { - $picture->status |= FILE_STATUS_PERMANENT; + $picture->status = FILE_STATUS_PERMANENT; $edit['picture'] = file_save($picture); } } |