aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/ucp/ucp_groups.php
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2013-07-12 00:11:18 +0200
committerAndreas Fischer <bantu@phpbb.com>2013-07-12 00:11:18 +0200
commit382ae5a01ee9c1b694382f2e9a7cc14ffb6974ac (patch)
tree348e54e75d7d54e3ad35972b02b6213b0ae55fdb /phpBB/includes/ucp/ucp_groups.php
parentbf43da75f81761a277d68306e87c1c720d15d458 (diff)
parenta7edbf9258253dd694857af80273f6cddfe91274 (diff)
downloadforums-382ae5a01ee9c1b694382f2e9a7cc14ffb6974ac.tar
forums-382ae5a01ee9c1b694382f2e9a7cc14ffb6974ac.tar.gz
forums-382ae5a01ee9c1b694382f2e9a7cc14ffb6974ac.tar.bz2
forums-382ae5a01ee9c1b694382f2e9a7cc14ffb6974ac.tar.xz
forums-382ae5a01ee9c1b694382f2e9a7cc14ffb6974ac.zip
Merge branch 'develop-olympus' into develop
* develop-olympus: [ticket/11548] Use new static methods for request and submit [ticket/11548] Run array_map on complete error array and not just colour_error Conflicts: tests/functional/ucp_groups_test.php
Diffstat (limited to 'phpBB/includes/ucp/ucp_groups.php')
-rw-r--r--phpBB/includes/ucp/ucp_groups.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/phpBB/includes/ucp/ucp_groups.php b/phpBB/includes/ucp/ucp_groups.php
index aada0525a8..8620e33e47 100644
--- a/phpBB/includes/ucp/ucp_groups.php
+++ b/phpBB/includes/ucp/ucp_groups.php
@@ -565,7 +565,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))
@@ -613,6 +613,7 @@ class ucp_groups
if (sizeof($error))
{
+ $error = array_map(array(&$user, 'lang'), $error);
$group_rank = $submit_ary['rank'];
$group_desc_data = array(