diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2013-07-12 20:09:22 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2013-07-12 20:09:22 +0200 |
| commit | 0d0338a55c0b4f9ec4c1a4c34f482382b09105da (patch) | |
| tree | 5a12dda992101773b42319866e4595aa7f2918f8 /phpBB | |
| parent | ac9dfd023c147d81a3246d6401b0066baf9c5ad8 (diff) | |
| parent | 67c10ca622139ad5227e32153b44765a58f497d1 (diff) | |
| download | forums-0d0338a55c0b4f9ec4c1a4c34f482382b09105da.tar forums-0d0338a55c0b4f9ec4c1a4c34f482382b09105da.tar.gz forums-0d0338a55c0b4f9ec4c1a4c34f482382b09105da.tar.bz2 forums-0d0338a55c0b4f9ec4c1a4c34f482382b09105da.tar.xz forums-0d0338a55c0b4f9ec4c1a4c34f482382b09105da.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/11548] Fix incorrect usage of array_map on acp groups page
Conflicts:
tests/functional/common_groups_test.php
tests/functional/ucp_groups_test.php
Diffstat (limited to 'phpBB')
| -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( |