diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2013-02-19 12:30:14 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2013-02-19 12:30:14 +0100 |
| commit | a9e0aea4b1587ac5ff6c94d2dc7e4d05c304423d (patch) | |
| tree | 8c50f175e939eba3cc0419e92df80802b69ac96d /phpBB/includes/acp/acp_groups.php | |
| parent | 2302cd7a42004b288c5f6be6d0e4b63fe363a983 (diff) | |
| download | forums-a9e0aea4b1587ac5ff6c94d2dc7e4d05c304423d.tar forums-a9e0aea4b1587ac5ff6c94d2dc7e4d05c304423d.tar.gz forums-a9e0aea4b1587ac5ff6c94d2dc7e4d05c304423d.tar.bz2 forums-a9e0aea4b1587ac5ff6c94d2dc7e4d05c304423d.tar.xz forums-a9e0aea4b1587ac5ff6c94d2dc7e4d05c304423d.zip | |
[feature/avatars] Remove trailing whitespace from avatar code
PHPBB3-10018
Diffstat (limited to 'phpBB/includes/acp/acp_groups.php')
| -rw-r--r-- | phpBB/includes/acp/acp_groups.php | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/phpBB/includes/acp/acp_groups.php b/phpBB/includes/acp/acp_groups.php index 483bf47db2..56063759c9 100644 --- a/phpBB/includes/acp/acp_groups.php +++ b/phpBB/includes/acp/acp_groups.php @@ -329,7 +329,7 @@ class acp_groups { $submit_ary['founder_manage'] = isset($_REQUEST['group_founder_manage']) ? 1 : 0; } - + if ($config['allow_avatar']) { // Handle avatar @@ -343,7 +343,6 @@ class acp_groups if ($result && empty($avatar_error)) { $result['avatar_type'] = $driver_name; - $submit_ary = array_merge($submit_ary, $result); } } @@ -547,9 +546,9 @@ class acp_groups } } } - + $avatar = phpbb_get_group_avatar($group_row, 'GROUP_AVATAR', true); - + // Merge any avatar errors into the primary error array $error = array_merge($error, $phpbb_avatar_manager->localize_errors($user, $avatar_error)); |