diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2010-07-15 23:15:41 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2010-07-15 23:15:41 +0200 |
| commit | 0dc05a2d8431ce01434dbe27b6708eefc59f2f68 (patch) | |
| tree | 9987af9bd01679dd8402b89a7f48e2763bc594a4 /phpBB/includes/functions_user.php | |
| parent | cb043b0e6132f2d041b906b11ebb1debfeb943a6 (diff) | |
| parent | 8690d25b4fab47853bcab46fc07ee577569c6822 (diff) | |
| download | forums-0dc05a2d8431ce01434dbe27b6708eefc59f2f68.tar forums-0dc05a2d8431ce01434dbe27b6708eefc59f2f68.tar.gz forums-0dc05a2d8431ce01434dbe27b6708eefc59f2f68.tar.bz2 forums-0dc05a2d8431ce01434dbe27b6708eefc59f2f68.tar.xz forums-0dc05a2d8431ce01434dbe27b6708eefc59f2f68.zip | |
Merge branch 'ticket/kellanved/9504' into develop-olympus
* ticket/kellanved/9504:
[ticket/9504] Allow whitespaces in gallery avatars
Diffstat (limited to 'phpBB/includes/functions_user.php')
| -rw-r--r-- | phpBB/includes/functions_user.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php index 6f6d7526b7..0b26f28864 100644 --- a/phpBB/includes/functions_user.php +++ b/phpBB/includes/functions_user.php @@ -2352,7 +2352,7 @@ function avatar_process_user(&$error, $custom_userdata = false, $can_upload = nu } else { - list($sql_ary['user_avatar_width'], $sql_ary['user_avatar_height']) = getimagesize($phpbb_root_path . $config['avatar_gallery_path'] . '/' . $category . '/' . $sql_ary['user_avatar']); + list($sql_ary['user_avatar_width'], $sql_ary['user_avatar_height']) = getimagesize($phpbb_root_path . $config['avatar_gallery_path'] . '/' . $category . '/' . urldecode($sql_ary['user_avatar'])); $sql_ary['user_avatar'] = $category . '/' . $sql_ary['user_avatar']; } } |