diff options
| author | Nathan Guse <nathaniel.guse@gmail.com> | 2013-12-04 09:48:10 -0800 |
|---|---|---|
| committer | Nathan Guse <nathaniel.guse@gmail.com> | 2013-12-04 09:48:10 -0800 |
| commit | e399a52816c57426de1147d4994df58f4c581313 (patch) | |
| tree | 73187fd2203278bd155c7d2758c13748de9ccd34 /phpBB/includes | |
| parent | b474917ba3fbb26e50a7145fa904efec949f20ce (diff) | |
| parent | 2f4d15015e7a0e8d8f9a76b60c5c8c0091e399ca (diff) | |
| download | forums-e399a52816c57426de1147d4994df58f4c581313.tar forums-e399a52816c57426de1147d4994df58f4c581313.tar.gz forums-e399a52816c57426de1147d4994df58f4c581313.tar.bz2 forums-e399a52816c57426de1147d4994df58f4c581313.tar.xz forums-e399a52816c57426de1147d4994df58f4c581313.zip | |
Merge pull request #1887 from nickvergessen/ticket/skouat/10910
[ticket/10910] Function build_cfg_template() allow $size for $tpl_type = select
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/functions_acp.php | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/phpBB/includes/functions_acp.php b/phpBB/includes/functions_acp.php index b9210114ef..cb44ed2794 100644 --- a/phpBB/includes/functions_acp.php +++ b/phpBB/includes/functions_acp.php @@ -363,7 +363,9 @@ function build_cfg_template($tpl_type, $key, &$new, $config_key, $vars) if ($tpl_type[0] == 'select') { - $tpl = '<select id="' . $key . '" name="' . $name . '">' . $return . '</select>'; + $size = (isset($tpl_type[1])) ? (int) $tpl_type[1] : 1; + + $tpl = '<select id="' . $key . '" name="' . $name . '"' . (($size > 1) ? ' size="' . $size . '"' : '') . '>' . $return . '</select>'; } else { |