diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2012-11-12 14:57:28 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2012-11-12 14:57:28 +0100 |
| commit | 2265811cd16f6473807f647cba4693c5366324c6 (patch) | |
| tree | ff27efb016da2f8adff55e2d343c1163d26219d8 /phpBB/download | |
| parent | 5a5e507a14084b08e41c4d2f86f2fb6700e68eb5 (diff) | |
| parent | 0e2a30a27b92a851221be489370217b9c7bf8e07 (diff) | |
| download | forums-2265811cd16f6473807f647cba4693c5366324c6.tar forums-2265811cd16f6473807f647cba4693c5366324c6.tar.gz forums-2265811cd16f6473807f647cba4693c5366324c6.tar.bz2 forums-2265811cd16f6473807f647cba4693c5366324c6.tar.xz forums-2265811cd16f6473807f647cba4693c5366324c6.zip | |
Merge branch 'feature/avatars' of https://github.com/igorw/phpbb3 into feature/avatars
Conflicts:
phpBB/adm/style/acp_groups.html
phpBB/adm/style/acp_users_avatar.html
phpBB/includes/acp/acp_groups.php
phpBB/includes/acp/acp_users.php
phpBB/includes/functions_display.php
phpBB/install/database_update.php
phpBB/install/schemas/mssql_schema.sql
phpBB/styles/prosilver/template/ucp_avatar_options.html
Diffstat (limited to 'phpBB/download')
| -rw-r--r-- | phpBB/download/file.php | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/phpBB/download/file.php b/phpBB/download/file.php index 79f53245b9..cb5fcbbef0 100644 --- a/phpBB/download/file.php +++ b/phpBB/download/file.php @@ -101,6 +101,8 @@ 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()); + $filename = request_var('avatar', ''); $avatar_group = false; $exit = false; |