diff options
| author | Nils Adermann <naderman@naderman.de> | 2012-07-22 16:25:17 -0700 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2012-07-22 16:25:17 -0700 |
| commit | 147a125f69683f2f87017bf9870c804a9f09c3d3 (patch) | |
| tree | ee9fd0d72ebdd5f113c7756a661525f92aff77b4 /phpBB/includes/ucp/ucp_groups.php | |
| parent | 34d5fa69959803ed853cf0d2a8ed3e1506061622 (diff) | |
| parent | 577dbf89518521f581117df9575363c3a2e16b5f (diff) | |
| download | forums-147a125f69683f2f87017bf9870c804a9f09c3d3.tar forums-147a125f69683f2f87017bf9870c804a9f09c3d3.tar.gz forums-147a125f69683f2f87017bf9870c804a9f09c3d3.tar.bz2 forums-147a125f69683f2f87017bf9870c804a9f09c3d3.tar.xz forums-147a125f69683f2f87017bf9870c804a9f09c3d3.zip | |
Merge pull request #914 from EXreaction/ticket/10990
Ticket/10990
Diffstat (limited to 'phpBB/includes/ucp/ucp_groups.php')
| -rw-r--r-- | phpBB/includes/ucp/ucp_groups.php | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/phpBB/includes/ucp/ucp_groups.php b/phpBB/includes/ucp/ucp_groups.php index aa9510b63b..65ab92e78e 100644 --- a/phpBB/includes/ucp/ucp_groups.php +++ b/phpBB/includes/ucp/ucp_groups.php @@ -846,7 +846,7 @@ class ucp_groups $base_url = $this->u_action . "&action=$action&g=$group_id"; phpbb_generate_template_pagination($template, $base_url, 'pagination', 'start', $total_members, $config['topics_per_page'], $start); - + $template->assign_vars(array( 'S_LIST' => true, 'S_ACTION_OPTIONS' => $s_action_options, @@ -1069,7 +1069,8 @@ class ucp_groups 'mode' => $mode, 'action' => $action ); - confirm_box(false, $user->lang('GROUP_CONFIRM_ADD_USERS', sizeof($name_ary), implode(', ', $name_ary)), build_hidden_fields($s_hidden_fields)); + + confirm_box(false, $user->lang('GROUP_CONFIRM_ADD_USERS', sizeof($name_ary), implode($user->lang['COMMA_SEPARATOR'], $name_ary)), build_hidden_fields($s_hidden_fields)); } trigger_error($user->lang['NO_USERS_ADDED'] . '<br /><br />' . sprintf($user->lang['RETURN_PAGE'], '<a href="' . $this->u_action . '&action=list&g=' . $group_id . '">', '</a>')); |