diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2011-06-06 11:06:01 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2011-06-06 11:06:01 +0200 |
| commit | ad90f262ffc511c6c3f28a946eff411754936e38 (patch) | |
| tree | 356e02999ce6db2d361b32b1cb214f0e4b79b183 /phpBB/includes/acp | |
| parent | b55bfb459e70bd636033b32d65e3436a006acac7 (diff) | |
| parent | 759f8d5c2cecad63dfcdf29af28dc5e1c6198ab1 (diff) | |
| download | forums-ad90f262ffc511c6c3f28a946eff411754936e38.tar forums-ad90f262ffc511c6c3f28a946eff411754936e38.tar.gz forums-ad90f262ffc511c6c3f28a946eff411754936e38.tar.bz2 forums-ad90f262ffc511c6c3f28a946eff411754936e38.tar.xz forums-ad90f262ffc511c6c3f28a946eff411754936e38.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/10067] Add separator to h_radio to place options on individual lines
Conflicts:
phpBB/adm/index.php
Diffstat (limited to 'phpBB/includes/acp')
| -rw-r--r-- | phpBB/includes/acp/acp_board.php | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php index 387b8f1fb9..d4f32daf04 100644 --- a/phpBB/includes/acp/acp_board.php +++ b/phpBB/includes/acp/acp_board.php @@ -772,18 +772,19 @@ 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); + $radio_ary = array( + USER_ACTIVATION_DISABLE => 'ACC_DISABLE', + USER_ACTIVATION_NONE => 'ACC_NONE', + ); + if ($config['email_enable']) { - $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); + $radio_ary[USER_ACTIVATION_SELF] = 'ACC_USER'; + $radio_ary[USER_ACTIVATION_ADMIN] = 'ACC_ADMIN'; } + $radio_text = h_radio('config[require_activation]', $radio_ary, $value, 'require_activation', $key, '<br />'); + return $radio_text; } |