aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/functions_display.php
diff options
context:
space:
mode:
authorHenry Sudhof <kellanved@phpbb.com>2007-04-30 10:46:17 +0000
committerHenry Sudhof <kellanved@phpbb.com>2007-04-30 10:46:17 +0000
commit42251d008c06ad0f475f116643c6583fc9a4eda7 (patch)
tree0380ef1d4f7224c96612a8951988a59f33c6074e /phpBB/includes/functions_display.php
parentdc747b8d994b6f5d07182196ed9deed7959a7317 (diff)
downloadforums-42251d008c06ad0f475f116643c6583fc9a4eda7.tar
forums-42251d008c06ad0f475f116643c6583fc9a4eda7.tar.gz
forums-42251d008c06ad0f475f116643c6583fc9a4eda7.tar.bz2
forums-42251d008c06ad0f475f116643c6583fc9a4eda7.tar.xz
forums-42251d008c06ad0f475f116643c6583fc9a4eda7.zip
Prepare to be yelled at and brace for the tide of bug reports: I had hoped we would not have to do this, but it seems that we have to.
-Route all avatar downloads through download.php - adrien -Change the way inline attachments are delivered -Fixes a few (unreported) bugs, notably avatar upload during group generation -#10079 git-svn-id: file:///svn/phpbb/trunk@7429 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/functions_display.php')
-rw-r--r--phpBB/includes/functions_display.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/functions_display.php b/phpBB/includes/functions_display.php
index 26e7f050a8..6ae606c6a5 100644
--- a/phpBB/includes/functions_display.php
+++ b/phpBB/includes/functions_display.php
@@ -1117,7 +1117,7 @@ function get_user_rank($user_rank, $user_posts, &$rank_title, &$rank_img, &$rank
*/
function get_user_avatar($avatar, $avatar_type, $avatar_width, $avatar_height, $alt = 'USER_AVATAR')
{
- global $user, $config, $phpbb_root_path;
+ global $user, $config, $phpbb_root_path, $phpEx;
if (empty($avatar) || !$avatar_type)
{
@@ -1129,7 +1129,7 @@ function get_user_avatar($avatar, $avatar_type, $avatar_width, $avatar_height, $
switch ($avatar_type)
{
case AVATAR_UPLOAD:
- $avatar_img = $phpbb_root_path . $config['avatar_path'] . '/';
+ $avatar_img = $phpbb_root_path . "download.$phpEx?avatar=";
break;
case AVATAR_GALLERY: