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/acp/acp_users.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/acp/acp_users.php')
| -rw-r--r-- | phpBB/includes/acp/acp_users.php | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php index c0da9b8ce0..12da482dbe 100644 --- a/phpBB/includes/acp/acp_users.php +++ b/phpBB/includes/acp/acp_users.php @@ -32,6 +32,7 @@ class acp_users { global $config, $db, $user, $auth, $template, $cache; global $phpbb_root_path, $phpbb_admin_path, $phpEx, $table_prefix, $file_uploads; + global $request; $user->add_lang(array('posting', 'ucp', 'acp/users')); $this->tpl_name = 'acp_users'; @@ -466,7 +467,7 @@ class acp_users $db->sql_query($sql); // Delete old avatar if present - $avatar_manager = new phpbb_avatar_manager($phpbb_root_path, $phpEx, $config, $cache->getDriver()); + $avatar_manager = new phpbb_avatar_manager($phpbb_root_path, $phpEx, $config, $request, $cache->getDriver()); if ($driver = $avatar_manager->get_driver($user_row['user_avatar_type'])) { $driver->delete($user_row); @@ -1687,7 +1688,7 @@ class acp_users $avatars_enabled = false; if ($config['allow_avatar']) { - $avatar_manager = new phpbb_avatar_manager($phpbb_root_path, $phpEx, $config, $cache->getDriver()); + $avatar_manager = new phpbb_avatar_manager($phpbb_root_path, $phpEx, $config, $request, $cache->getDriver()); $avatar_drivers = $avatar_manager->get_valid_drivers(); sort($avatar_drivers); |