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/functions_acp.php | |
| 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/functions_acp.php')
| -rw-r--r-- | phpBB/includes/functions_acp.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/functions_acp.php b/phpBB/includes/functions_acp.php index f28bca91ee..5ff77855f0 100644 --- a/phpBB/includes/functions_acp.php +++ b/phpBB/includes/functions_acp.php @@ -164,7 +164,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; @@ -173,7 +173,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; } |