diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2012-11-14 23:14:41 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2012-11-15 18:10:54 +0100 |
| commit | 60b4c907b292a46b40cad1c0330e76b897a2309b (patch) | |
| tree | b052a9b4af0a9b71a83bb3ec730f19dc46cd4bfb /phpBB/includes/ucp/ucp_profile.php | |
| parent | 076785d76a1412394636095f0b296964419e2a4f (diff) | |
| download | forums-60b4c907b292a46b40cad1c0330e76b897a2309b.tar forums-60b4c907b292a46b40cad1c0330e76b897a2309b.tar.gz forums-60b4c907b292a46b40cad1c0330e76b897a2309b.tar.bz2 forums-60b4c907b292a46b40cad1c0330e76b897a2309b.tar.xz forums-60b4c907b292a46b40cad1c0330e76b897a2309b.zip | |
[feature/avatars] Add service containers for avatars
PHPBB3-10018
Diffstat (limited to 'phpBB/includes/ucp/ucp_profile.php')
| -rw-r--r-- | phpBB/includes/ucp/ucp_profile.php | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/phpBB/includes/ucp/ucp_profile.php b/phpBB/includes/ucp/ucp_profile.php index 4b0e59b9e8..aa5e279ce2 100644 --- a/phpBB/includes/ucp/ucp_profile.php +++ b/phpBB/includes/ucp/ucp_profile.php @@ -563,8 +563,9 @@ class ucp_profile { if (check_form_key('ucp_avatar')) { - $driver = request_var('avatar_driver', ''); - if (in_array($driver, $avatar_drivers) && $config["allow_avatar_$driver"]) + $driver = str_replace('_', '.', request_var('avatar_driver', '')); + $config_name = preg_replace('#^avatar.driver.core.#', '', $driver); + if (in_array($driver, $avatar_drivers) && $config["allow_avatar_$config_name"]) { $avatar = $phpbb_avatar_manager->get_driver($driver); $result = $avatar->process_form($template, $avatar_data, $error); @@ -643,7 +644,7 @@ class ucp_profile 'L_TITLE' => $user->lang('AVATAR_DRIVER_' . $driver_u . '_TITLE'), // @TODO add lang values 'L_EXPLAIN' => $user->lang('AVATAR_DRIVER_' . $driver_u . '_EXPLAIN'), - 'DRIVER' => $driver, + 'DRIVER' => str_replace('.', '_', $driver), 'SELECTED' => ($driver == $focused_driver), 'OUTPUT' => $template->assign_display('avatar'), )); |