diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2011-06-06 10:58:05 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2011-06-06 10:58:05 +0200 |
| commit | 759f8d5c2cecad63dfcdf29af28dc5e1c6198ab1 (patch) | |
| tree | f1776b048de037159b693927e3393cb9b8d51c03 /phpBB | |
| parent | 893d0ae96f4fba26a10b909d39abe952601bca41 (diff) | |
| parent | 26e052bb26a683bff17d86ae2beecc66ffcd93cf (diff) | |
| download | forums-759f8d5c2cecad63dfcdf29af28dc5e1c6198ab1.tar forums-759f8d5c2cecad63dfcdf29af28dc5e1c6198ab1.tar.gz forums-759f8d5c2cecad63dfcdf29af28dc5e1c6198ab1.tar.bz2 forums-759f8d5c2cecad63dfcdf29af28dc5e1c6198ab1.tar.xz forums-759f8d5c2cecad63dfcdf29af28dc5e1c6198ab1.zip | |
Merge remote-tracking branch 'naderman/ticket/10067' into develop-olympus
* naderman/ticket/10067:
[ticket/10067] Add separator to h_radio to place options on individual lines
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/adm/index.php | 4 | ||||
| -rw-r--r-- | phpBB/includes/acp/acp_board.php | 17 |
2 files changed, 11 insertions, 10 deletions
diff --git a/phpBB/adm/index.php b/phpBB/adm/index.php index dd8f4c279d..74e51a8696 100644 --- a/phpBB/adm/index.php +++ b/phpBB/adm/index.php @@ -237,7 +237,7 @@ function build_select($option_ary, $option_default = false) /** * Build radio fields in acp pages */ -function h_radio($name, &$input_ary, $input_default = false, $id = false, $key = false) +function h_radio($name, $input_ary, $input_default = false, $id = false, $key = false, $separator = '') { global $user; @@ -246,7 +246,7 @@ function h_radio($name, &$input_ary, $input_default = false, $id = false, $key = foreach ($input_ary as $value => $title) { $selected = ($input_default !== false && $value == $input_default) ? ' checked="checked"' : ''; - $html .= '<label><input type="radio" name="' . $name . '"' . (($id && !$id_assigned) ? ' id="' . $id . '"' : '') . ' value="' . $value . '"' . $selected . (($key) ? ' accesskey="' . $key . '"' : '') . ' class="radio" /> ' . $user->lang[$title] . '</label>'; + $html .= '<label><input type="radio" name="' . $name . '"' . (($id && !$id_assigned) ? ' id="' . $id . '"' : '') . ' value="' . $value . '"' . $selected . (($key) ? ' accesskey="' . $key . '"' : '') . ' class="radio" /> ' . $user->lang[$title] . '</label>' . $separator; $id_assigned = true; } diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php index 8f7d08cc8f..d38c4d58ba 100644 --- a/phpBB/includes/acp/acp_board.php +++ b/phpBB/includes/acp/acp_board.php @@ -769,18 +769,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; } |