diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2013-07-11 23:38:49 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2013-07-11 23:38:49 +0200 |
| commit | a7edbf9258253dd694857af80273f6cddfe91274 (patch) | |
| tree | 541bd9410d67aa26c3afc10f8548bfa6cc196b25 /phpBB | |
| parent | 94e5bfaadad3be2bcda5347754c3f1b5be33c620 (diff) | |
| parent | 2667c3a527b3a2362370583446231391a4354565 (diff) | |
| download | forums-a7edbf9258253dd694857af80273f6cddfe91274.tar forums-a7edbf9258253dd694857af80273f6cddfe91274.tar.gz forums-a7edbf9258253dd694857af80273f6cddfe91274.tar.bz2 forums-a7edbf9258253dd694857af80273f6cddfe91274.tar.xz forums-a7edbf9258253dd694857af80273f6cddfe91274.zip | |
Merge remote-tracking branch 'marc1706/ticket/11548' into develop-olympus
* marc1706/ticket/11548:
[ticket/11548] Use new static methods for request and submit
[ticket/11548] Run array_map on complete error array and not just colour_error
Diffstat (limited to 'phpBB')
| -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( |