Merge branch 'develop-ascraeus' into develop

# By Marc Alexander
# Via Dhruv Goel (1) and Marc Alexander (1)
* develop-ascraeus:
  [ticket/12694] Remove whitespace at end of line from acp_groups
This commit is contained in:
Dhruv 2014-06-11 22:44:35 +05:30
commit 464a1190ea

View file

@ -513,7 +513,7 @@ class acp_groups
'test_variables',
);
extract($phpbb_dispatcher->trigger_event('core.acp_manage_group_initialise_data', compact($vars)));
foreach ($test_variables as $test => $type)
{
if (isset($submit_ary[$test]) && ($action == 'add' || $group_row['group_' . $test] != $submit_ary[$test] || isset($group_attributes['group_avatar']) && strpos($test, 'avatar') === 0 || in_array($test, $set_attributes)))