diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-05-11 10:51:36 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-05-11 10:51:36 +0200 |
| commit | f861df10a13ed0ee3573737a3c14aa7af070a447 (patch) | |
| tree | 7c9e18e9ab43653e166739b9392c2f8234ade889 /phpBB/includes/functions_acp.php | |
| parent | 243cce0350b8c64e0d22d8cf49dc1912f5f91f82 (diff) | |
| parent | 6cd7abe2557336a88db0220603c83743f1291642 (diff) | |
| download | forums-f861df10a13ed0ee3573737a3c14aa7af070a447.tar forums-f861df10a13ed0ee3573737a3c14aa7af070a447.tar.gz forums-f861df10a13ed0ee3573737a3c14aa7af070a447.tar.bz2 forums-f861df10a13ed0ee3573737a3c14aa7af070a447.tar.xz forums-f861df10a13ed0ee3573737a3c14aa7af070a447.zip | |
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
[ticket/9388] Use "togglable" instead of "toggable"
[ticket/9388] Do not nest the <fieldset> tags in the OAuth settings.
[ticket/9388] Reopen <fieldset> after auth templates.
[ticket/9388] Fix unit tests.
[ticket/9388] Use the new toggle function for the avatar type <select>.
[ticket/9388] Display only the settings for the selected search backend.
[ticket/9388] Display only the settings for the auth method that's selected.
[ticket/9388] Add support for making <select> options able to toggle settings.
Diffstat (limited to 'phpBB/includes/functions_acp.php')
| -rw-r--r-- | phpBB/includes/functions_acp.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/phpBB/includes/functions_acp.php b/phpBB/includes/functions_acp.php index 2c66f6009c..1c4d6966da 100644 --- a/phpBB/includes/functions_acp.php +++ b/phpBB/includes/functions_acp.php @@ -364,8 +364,9 @@ function build_cfg_template($tpl_type, $key, &$new, $config_key, $vars) if ($tpl_type[0] == 'select') { $size = (isset($tpl_type[1])) ? (int) $tpl_type[1] : 1; + $data_toggle = (!empty($tpl_type[2])) ? ' data-togglable-settings="true"' : ''; - $tpl = '<select id="' . $key . '" name="' . $name . '"' . (($size > 1) ? ' size="' . $size . '"' : '') . '>' . $return . '</select>'; + $tpl = '<select id="' . $key . '" name="' . $name . '"' . (($size > 1) ? ' size="' . $size . '"' : '') . $data_toggle . '>' . $return . '</select>'; } else { |