diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2013-07-12 19:53:45 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2013-07-12 19:53:45 +0200 |
| commit | 67c10ca622139ad5227e32153b44765a58f497d1 (patch) | |
| tree | ebf8f4f42807850c879130d7c0543e91f80b91b5 /phpBB | |
| parent | 16aeaed7bda590268c621216a42818ec64c1f37b (diff) | |
| parent | da8e35ac77c5d78f327d08fa1a9d0ff21ed38e83 (diff) | |
| download | forums-67c10ca622139ad5227e32153b44765a58f497d1.tar forums-67c10ca622139ad5227e32153b44765a58f497d1.tar.gz forums-67c10ca622139ad5227e32153b44765a58f497d1.tar.bz2 forums-67c10ca622139ad5227e32153b44765a58f497d1.tar.xz forums-67c10ca622139ad5227e32153b44765a58f497d1.zip | |
Merge remote-tracking branch 'marc1706/ticket/11548-develop-olympus' into develop-olympus
* marc1706/ticket/11548-develop-olympus:
[ticket/11548] Fix incorrect usage of array_map on acp groups page
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 9b9ea38e07..c9d476b8ae 100644 --- a/phpBB/includes/acp/acp_groups.php +++ b/phpBB/includes/acp/acp_groups.php @@ -437,7 +437,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)) @@ -530,6 +530,7 @@ class acp_groups if (sizeof($error)) { + $error = array_map(array(&$user, 'lang'), $error); $group_rank = $submit_ary['rank']; $group_desc_data = array( |