summaryrefslogtreecommitdiff
path: root/modules/user/user.module
diff options
context:
space:
mode:
authorDries Buytaert <dries@buytaert.net>2009-10-20 00:55:30 +0000
committerDries Buytaert <dries@buytaert.net>2009-10-20 00:55:30 +0000
commit0d2b7fe81b37ce2ccddca0d6bbd1aa276d20d82e (patch)
treefdca2c31435f098d88fb23a5b5a94ce912282327 /modules/user/user.module
parenteeb7b53ef6c2098a0e428f98dd578eaa78a1ed89 (diff)
downloadbrdo-0d2b7fe81b37ce2ccddca0d6bbd1aa276d20d82e.tar.gz
brdo-0d2b7fe81b37ce2ccddca0d6bbd1aa276d20d82e.tar.bz2
- Patch #443200 by c960657: fixed user pictures not working with private files.
Diffstat (limited to 'modules/user/user.module')
-rw-r--r--modules/user/user.module6
1 files changed, 3 insertions, 3 deletions
diff --git a/modules/user/user.module b/modules/user/user.module
index 424916ef4..5e4f60ade 100644
--- a/modules/user/user.module
+++ b/modules/user/user.module
@@ -747,9 +747,9 @@ function user_permission() {
*
* Ensure that user pictures (avatars) are always downloadable.
*/
-function user_file_download($filepath) {
- if (strpos(file_uri_target($filepath), variable_get('user_picture_path', 'pictures') . '/picture-') === 0) {
- $info = image_get_info($filepath);
+function user_file_download($uri) {
+ if (strpos(file_uri_target($uri), variable_get('user_picture_path', 'pictures') . '/picture-') === 0) {
+ $info = image_get_info($uri);
return array('Content-Type' => $info['mime_type']);
}
}