diff options
| author | David King <imkingdavid@gmail.com> | 2013-07-13 11:33:49 -0400 |
|---|---|---|
| committer | David King <imkingdavid@gmail.com> | 2013-07-13 11:33:49 -0400 |
| commit | 2bc918d3f9282de887cc09f830ff35073865366e (patch) | |
| tree | af266a7b312ae4e4f9fdddb952d2f53e5d240c06 /phpBB/includes/acp/acp_groups.php | |
| parent | 068d35065278bf52e85fcc96b629d25712f19c26 (diff) | |
| parent | fd10d97cb1e6c43b88b923bab1015cafe03d379c (diff) | |
| download | forums-2bc918d3f9282de887cc09f830ff35073865366e.tar forums-2bc918d3f9282de887cc09f830ff35073865366e.tar.gz forums-2bc918d3f9282de887cc09f830ff35073865366e.tar.bz2 forums-2bc918d3f9282de887cc09f830ff35073865366e.tar.xz forums-2bc918d3f9282de887cc09f830ff35073865366e.zip | |
Merge branch 'develop' into ticket/11215
* develop: (53 commits)
[ticket/11671] Update composer.lock
[ticket/11671] Update composer.lock
[ticket/11671] Add phing as a dependency and upgrade deps
[ticket/11668] Move lint test to the end for travis
[ticket/11626] Remove last reference to template in ldap
[ticket/11626] Remove LDAP dependency on template
[develop-olympus] Increment version number to 3.0.13-dev.
[develop-olympus] Add changelog for 3.0.12 release.
[develop-olympus] Bump version numbers for 3.0.12-RC1 release.
[develop-olympus] Bumping version numbers to final for 3.0.12 releases.
[ticket/11669] Fix PHP bug #55124 (recursive mkdir on /./)
[ticket/11668] Run lint test at the end of the test suite
[ticket/11548] Fix test errors in groups test on develop
[ticket/11548] Check upload avatar URL the same way as in phpBB 3.0
[ticket/11548] Fix incorrect usage of array_map on acp groups page
[ticket/11665] Fix test class name
[ticket/11664] Stop creating php.html file in root path in tests
[ticket/11665] Can't change file names already sent to set_filenames
[ticket/11662] Typos: occured -> occurred
[ticket/11662] Typos: occured -> occurred
...
Diffstat (limited to 'phpBB/includes/acp/acp_groups.php')
| -rw-r--r-- | phpBB/includes/acp/acp_groups.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/phpBB/includes/acp/acp_groups.php b/phpBB/includes/acp/acp_groups.php index c79699d465..e6a36c97a8 100644 --- a/phpBB/includes/acp/acp_groups.php +++ b/phpBB/includes/acp/acp_groups.php @@ -410,7 +410,7 @@ class acp_groups if ($validation_error = validate_data($submit_ary, $validation_checks)) { // Replace "error" string with its real, localised form - $error = array_merge($error, array_map(array(&$user, 'lang'), $validation_error)); + $error = array_merge($error, $validation_error); } if (!sizeof($error)) @@ -507,6 +507,7 @@ class acp_groups if (sizeof($error)) { + $error = array_map(array(&$user, 'lang'), $error); $group_rank = $submit_ary['rank']; $group_desc_data = array( |