makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 06:08:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[feature/avatars] Small cosmetic changes

Browse source 
PHPBB3-10018
This commit is contained in:
Marc Alexander 2012-11-25 16:18:51 +01:00
parent 06639729ea
commit f8256ed00f
4 changed files with 9 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
phpBB/includes/acp/acp_groups.php
View file

@ -336,9 +336,8 @@ class acp_groups
// Handle avatar // Handle avatar
$driver = $phpbb_avatar_manager->clean_driver_name($request->variable('avatar_driver', '')); $driver = $phpbb_avatar_manager->clean_driver_name($request->variable('avatar_driver', ''));
$config_name = preg_replace('#^avatar\.driver.#', '', $driver); $config_name = preg_replace('#^avatar\.driver.#', '', $driver);
$avatar_delete = $request->variable('avatar_delete', '');
if (in_array($driver, $avatar_drivers) && $config["allow_avatar_$config_name"] && empty($avatar_delete)) if (in_array($driver, $avatar_drivers) && $config["allow_avatar_$config_name"] && !$request->is_set_post('avatar_delete'))
{ {
$avatar = $phpbb_avatar_manager->get_driver($driver); $avatar = $phpbb_avatar_manager->get_driver($driver);
$result = $avatar->process_form($template, $avatar_data, $avatar_error); $result = $avatar->process_form($template, $avatar_data, $avatar_error);

4
phpBB/includes/acp/acp_users.php
View file

@ -1749,8 +1749,8 @@ class acp_users
{ {
$driver = $phpbb_avatar_manager->clean_driver_name($request->variable('avatar_driver', '')); $driver = $phpbb_avatar_manager->clean_driver_name($request->variable('avatar_driver', ''));
$config_name = preg_replace('#^avatar\.driver.#', '', $driver); $config_name = preg_replace('#^avatar\.driver.#', '', $driver);
$avatar_delete = $request->variable('avatar_delete', '');
if (in_array($driver, $avatar_drivers) && $config["allow_avatar_$config_name"] && empty($avatar_delete)) if (in_array($driver, $avatar_drivers) && $config["allow_avatar_$config_name"] && !$request->is_set_post('avatar_delete'))
{ {
$avatar = $phpbb_avatar_manager->get_driver($driver); $avatar = $phpbb_avatar_manager->get_driver($driver);
$result = $avatar->process_form($template, $avatar_data, $error); $result = $avatar->process_form($template, $avatar_data, $error);

11
phpBB/includes/ucp/ucp_groups.php
View file

@ -523,20 +523,15 @@ class ucp_groups
// Handle avatar // Handle avatar
$driver = $phpbb_avatar_manager->clean_driver_name($request->variable('avatar_driver', '')); $driver = $phpbb_avatar_manager->clean_driver_name($request->variable('avatar_driver', ''));
$config_name = preg_replace('#^avatar\.driver.#', '', $driver); $config_name = preg_replace('#^avatar\.driver.#', '', $driver);
$avatar_delete = $request->variable('avatar_delete', '');
if (in_array($driver, $avatar_drivers) && $config["allow_avatar_$config_name"] && empty($avatar_delete)) if (in_array($driver, $avatar_drivers) && $config["allow_avatar_$config_name"] && !$request->is_set_post('avatar_delete'))
{ {
$avatar = $phpbb_avatar_manager->get_driver($driver); $avatar = $phpbb_avatar_manager->get_driver($driver);
$result = $avatar->process_form($template, $avatar_data, $avatar_error); $result = $avatar->process_form($template, $avatar_data, $avatar_error);
if ($result && empty($avatar_error)) if ($result && empty($avatar_error))
{ {
$result = array( $result['avatar_type'] = $driver;
'avatar_type' => $driver,
'avatar' => $result['avatar'],
'avatar_width' => $result['avatar_width'],
'avatar_height' => $result['avatar_height'],
);
$submit_ary = array_merge($submit_ary, $result); $submit_ary = array_merge($submit_ary, $result);
} }

4
phpBB/includes/ucp/ucp_profile.php
View file

@ -566,8 +566,8 @@ class ucp_profile
{ {
$driver = $phpbb_avatar_manager->clean_driver_name($request->variable('avatar_driver', '')); $driver = $phpbb_avatar_manager->clean_driver_name($request->variable('avatar_driver', ''));
$config_name = preg_replace('#^avatar\.driver.#', '', $driver); $config_name = preg_replace('#^avatar\.driver.#', '', $driver);
$avatar_delete = $request->variable('avatar_delete', '');
if (in_array($driver, $avatar_drivers) && $config["allow_avatar_$config_name"] && empty($avatar_delete)) if (in_array($driver, $avatar_drivers) && $config["allow_avatar_$config_name"] && !$request->is_set_post('avatar_delete'))
{ {
$avatar = $phpbb_avatar_manager->get_driver($driver); $avatar = $phpbb_avatar_manager->get_driver($driver);
$result = $avatar->process_form($template, $avatar_data, $error); $result = $avatar->process_form($template, $avatar_data, $error);