diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2012-11-17 13:53:24 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2012-11-17 13:53:24 +0100 |
| commit | 0a8d1220a39266d3805590fe2067934adc257c95 (patch) | |
| tree | 241604542d85a48081cd298a5e5c8dd0ebb6c1a6 /phpBB | |
| parent | c70cbfac4339529e196934405d0eb2f9672121d5 (diff) | |
| download | forums-0a8d1220a39266d3805590fe2067934adc257c95.tar forums-0a8d1220a39266d3805590fe2067934adc257c95.tar.gz forums-0a8d1220a39266d3805590fe2067934adc257c95.tar.bz2 forums-0a8d1220a39266d3805590fe2067934adc257c95.tar.xz forums-0a8d1220a39266d3805590fe2067934adc257c95.zip | |
[feature/avatars] Small fixes after transition to service containers
PHPBB3-10018
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/download/file.php | 2 | ||||
| -rw-r--r-- | phpBB/includes/avatar/driver/upload.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/download/file.php b/phpBB/download/file.php index cb5fcbbef0..70093db7dc 100644 --- a/phpBB/download/file.php +++ b/phpBB/download/file.php @@ -101,7 +101,7 @@ if (isset($_GET['avatar'])) // worst-case default $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', ''); $avatar_group = false; diff --git a/phpBB/includes/avatar/driver/upload.php b/phpBB/includes/avatar/driver/upload.php index a86cc44d2f..0d551efa07 100644 --- a/phpBB/includes/avatar/driver/upload.php +++ b/phpBB/includes/avatar/driver/upload.php @@ -29,7 +29,7 @@ class phpbb_avatar_driver_upload extends phpbb_avatar_driver if ($ignore_config || $this->config['allow_avatar_upload']) { 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'], 'height' => $row['avatar_height'], ); |