diff options
| author | Igor Wiedler <igor@wiedler.ch> | 2012-04-07 19:19:13 +0200 |
|---|---|---|
| committer | Igor Wiedler <igor@wiedler.ch> | 2012-04-07 19:20:11 +0200 |
| commit | e861bb0e04c08b03366ec7c58473b630acc91181 (patch) | |
| tree | d75650cb5d3a262eb3fe79c7842dce0f38b28a56 /phpBB/includes/functions_display.php | |
| parent | 3b0e0dba3279a78cab2336d32ee8ff63a7077c5c (diff) | |
| download | forums-e861bb0e04c08b03366ec7c58473b630acc91181.tar forums-e861bb0e04c08b03366ec7c58473b630acc91181.tar.gz forums-e861bb0e04c08b03366ec7c58473b630acc91181.tar.bz2 forums-e861bb0e04c08b03366ec7c58473b630acc91181.tar.xz forums-e861bb0e04c08b03366ec7c58473b630acc91181.zip | |
[feature/avatars] Use request object in avatar drivers
PHPBB3-10018
Diffstat (limited to 'phpBB/includes/functions_display.php')
| -rw-r--r-- | phpBB/includes/functions_display.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/phpBB/includes/functions_display.php b/phpBB/includes/functions_display.php index 1c1663f2cc..c59805dacd 100644 --- a/phpBB/includes/functions_display.php +++ b/phpBB/includes/functions_display.php @@ -1312,6 +1312,7 @@ function get_group_avatar($user_row, $alt = 'GROUP_AVATAR', $ignore_config = fal function get_avatar($row, $alt, $ignore_config = false) { global $user, $config, $cache, $phpbb_root_path, $phpEx; + global $request; static $avatar_manager = null; @@ -1369,7 +1370,7 @@ function get_avatar($row, $alt, $ignore_config = false) default: if (empty($avatar_manager)) { - $avatar_manager = new phpbb_avatar_manager($phpbb_root_path, $phpEx, $config, $cache->get_driver()); + $avatar_manager = new phpbb_avatar_manager($phpbb_root_path, $phpEx, $config, $request, $cache->get_driver()); } $avatar = $avatar_manager->get_driver($row['avatar_type']); |