diff options
| author | Nils Adermann <naderman@naderman.de> | 2011-06-05 02:49:35 +0200 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2011-06-05 02:49:35 +0200 |
| commit | a9f4e00234b98abbe70c6b697b82a9fcc9c922a4 (patch) | |
| tree | 912d3257beb49a12ec3086fcb47625fe1ab23a67 /phpBB/includes | |
| parent | 27e1f1319f17277e29e7e14fbf623e81bb0289f2 (diff) | |
| parent | 8155bc5a9dbbe5ad6a9ceb722baf4587db8f3689 (diff) | |
| download | forums-a9f4e00234b98abbe70c6b697b82a9fcc9c922a4.tar forums-a9f4e00234b98abbe70c6b697b82a9fcc9c922a4.tar.gz forums-a9f4e00234b98abbe70c6b697b82a9fcc9c922a4.tar.bz2 forums-a9f4e00234b98abbe70c6b697b82a9fcc9c922a4.tar.xz forums-a9f4e00234b98abbe70c6b697b82a9fcc9c922a4.zip | |
Merge branch 'ticket/p/10067' into develop-olympus
* ticket/p/10067:
[ticket/10067] Clarify language for user activation options in ACP.
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/acp/acp_board.php | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php index a5e80e1f6d..8f7d08cc8f 100644 --- a/phpBB/includes/acp/acp_board.php +++ b/phpBB/includes/acp/acp_board.php @@ -770,12 +770,18 @@ class acp_board global $user, $config; $radio_ary = array(USER_ACTIVATION_DISABLE => 'ACC_DISABLE', USER_ACTIVATION_NONE => 'ACC_NONE'); + $radio_text = h_radio('config[require_activation]', $radio_ary, $value, $key); if ($config['email_enable']) { - $radio_ary += array(USER_ACTIVATION_SELF => 'ACC_USER', USER_ACTIVATION_ADMIN => 'ACC_ADMIN'); + $radio_ary = array(USER_ACTIVATION_SELF => 'ACC_USER', USER_ACTIVATION_ADMIN => 'ACC_ADMIN'); + // With longer labels the four options no longer fit + // onto a single line. Separate them onto two lines. + // This also requires two h_radio calls to generate HTML. + $radio_text .= '<br /><br />'; + $radio_text .= h_radio('config[require_activation]', $radio_ary, $value, $key); } - return h_radio('config[require_activation]', $radio_ary, $value, $key); + return $radio_text; } /** |