1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-05 16:27:38 +02:00

[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
This commit is contained in:
Marc Alexander
2013-07-11 16:08:15 -04:00
parent a997768627
commit 599f83395f
2 changed files with 52 additions and 1 deletions

View File

@@ -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(