mirror of
https://github.com/phpbb/phpbb.git
synced 2025-08-10 02:36:38 +02:00
[feature/avatars] Small fixes after transition to service containers
PHPBB3-10018
This commit is contained in:
@@ -101,7 +101,7 @@ if (isset($_GET['avatar']))
|
|||||||
// worst-case default
|
// worst-case default
|
||||||
$browser = strtolower($request->header('User-Agent', 'msie 6.0'));
|
$browser = strtolower($request->header('User-Agent', 'msie 6.0'));
|
||||||
|
|
||||||
$phpbb_avatar_manager = new phpbb_avatar_manager($phpbb_root_path, $phpEx, $config, $request, $phpbb_extension_manager, $cache->get_driver());
|
$phpbb_avatar_manager = $phpbb_container->get('avatar.manager');
|
||||||
|
|
||||||
$filename = request_var('avatar', '');
|
$filename = request_var('avatar', '');
|
||||||
$avatar_group = false;
|
$avatar_group = false;
|
||||||
|
@@ -29,7 +29,7 @@ class phpbb_avatar_driver_upload extends phpbb_avatar_driver
|
|||||||
if ($ignore_config || $this->config['allow_avatar_upload'])
|
if ($ignore_config || $this->config['allow_avatar_upload'])
|
||||||
{
|
{
|
||||||
return array(
|
return array(
|
||||||
'src' => $this->phpbb_root_path . 'download/file.' . $this->phpEx . '?avatar=' . $row['avatar'],
|
'src' => $this->phpbb_root_path . 'download/file' . $this->phpEx . '?avatar=' . $row['avatar'],
|
||||||
'width' => $row['avatar_width'],
|
'width' => $row['avatar_width'],
|
||||||
'height' => $row['avatar_height'],
|
'height' => $row['avatar_height'],
|
||||||
);
|
);
|
||||||
|
Reference in New Issue
Block a user