aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/acp/acp_groups.php
diff options
context:
space:
mode:
authorAndy Chase <asperous2@gmail.com>2013-07-22 11:29:36 -0700
committerAndy Chase <asperous2@gmail.com>2013-07-22 11:29:36 -0700
commite2a769ac79ad408e94935c97a5fc1325fb838c4f (patch)
tree5f56bbc9d9290f49a6c88987561f345df49f8a3c /phpBB/includes/acp/acp_groups.php
parentcc1aef47fb4f5d37415436c62067ad2dcde768bb (diff)
parentb71038486e067daf0c608d73aabeb60a56e86840 (diff)
downloadforums-e2a769ac79ad408e94935c97a5fc1325fb838c4f.tar
forums-e2a769ac79ad408e94935c97a5fc1325fb838c4f.tar.gz
forums-e2a769ac79ad408e94935c97a5fc1325fb838c4f.tar.bz2
forums-e2a769ac79ad408e94935c97a5fc1325fb838c4f.tar.xz
forums-e2a769ac79ad408e94935c97a5fc1325fb838c4f.zip
Merge branch 'develop' into ticket/11620
Diffstat (limited to 'phpBB/includes/acp/acp_groups.php')
-rw-r--r--phpBB/includes/acp/acp_groups.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/phpBB/includes/acp/acp_groups.php b/phpBB/includes/acp/acp_groups.php
index c79699d465..e6a36c97a8 100644
--- a/phpBB/includes/acp/acp_groups.php
+++ b/phpBB/includes/acp/acp_groups.php
@@ -410,7 +410,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))
@@ -507,6 +507,7 @@ class acp_groups
if (sizeof($error))
{
+ $error = array_map(array(&$user, 'lang'), $error);
$group_rank = $submit_ary['rank'];
$group_desc_data = array(