diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2013-07-11 16:08:15 -0400 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2013-07-11 16:15:27 -0400 |
| commit | 599f83395f90c9a899b0e639ba5acacfb8ae372b (patch) | |
| tree | 052e156a413e732b7abb9d1ceeec8937cb72a7f8 /phpBB/includes | |
| parent | a9977686275f968a26272fb8bad28f7506f0043b (diff) | |
| download | forums-599f83395f90c9a899b0e639ba5acacfb8ae372b.tar forums-599f83395f90c9a899b0e639ba5acacfb8ae372b.tar.gz forums-599f83395f90c9a899b0e639ba5acacfb8ae372b.tar.bz2 forums-599f83395f90c9a899b0e639ba5acacfb8ae372b.tar.xz forums-599f83395f90c9a899b0e639ba5acacfb8ae372b.zip | |
[ticket/11548] Run array_map on complete error array and not just colour_error
Up to now the array_map() that turns error messages into the localized output
was only ran if the group's color was set. With this patch it'll run the
array_map() on the complete error array if it's not empty.
PHPBB3-11548
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/ucp/ucp_groups.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/phpBB/includes/ucp/ucp_groups.php b/phpBB/includes/ucp/ucp_groups.php index 9365913541..663b5bc931 100644 --- a/phpBB/includes/ucp/ucp_groups.php +++ b/phpBB/includes/ucp/ucp_groups.php @@ -599,7 +599,7 @@ class ucp_groups if ($colour_error = validate_data($submit_ary, array('colour' => array('hex_colour', true)))) { // Replace "error" string with its real, localised form - $error = array_merge($error, array_map(array(&$user, 'lang'), $colour_error)); + $error = array_merge($error, $colour_error); } if (!sizeof($error)) @@ -642,6 +642,7 @@ class ucp_groups if (sizeof($error)) { + $error = array_map(array(&$user, 'lang'), $error); $group_rank = $submit_ary['rank']; $group_desc_data = array( |