diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2009-08-12 15:00:47 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2009-08-12 15:00:47 +0000 |
| commit | 09ad10a734c0993f9465e6ac3463951251602fc6 (patch) | |
| tree | 80b534897042b0bff883687f9248f67b7af393f6 /phpBB/adm/index.php | |
| parent | 45964352e37217277527480fcd89222b33c22280 (diff) | |
| download | forums-09ad10a734c0993f9465e6ac3463951251602fc6.tar forums-09ad10a734c0993f9465e6ac3463951251602fc6.tar.gz forums-09ad10a734c0993f9465e6ac3463951251602fc6.tar.bz2 forums-09ad10a734c0993f9465e6ac3463951251602fc6.tar.xz forums-09ad10a734c0993f9465e6ac3463951251602fc6.zip | |
ok, i am very sorry, but this needs to be fixed.
Generally, our config table is not really suited for holding large datasets. Because feed settings for the forums to enable news feeds and excluded forums rely on the forums itself we have decided to introduce a forum_options table where custom options can be stored.
Additionally, for this to work across all DBMS we support, we added a new method to the DBAL for the bitwise AND operator.
Also moved the forum/topic feed template variable to the location where they belong to (forum and topic view)
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9965 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/adm/index.php')
| -rw-r--r-- | phpBB/adm/index.php | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/phpBB/adm/index.php b/phpBB/adm/index.php index 778070e2e1..b6b251d2fc 100644 --- a/phpBB/adm/index.php +++ b/phpBB/adm/index.php @@ -263,6 +263,12 @@ function build_cfg_template($tpl_type, $key, &$new, $config_key, $vars) $tpl = ''; $name = 'config[' . $config_key . ']'; + // Make sure there is no notice printed out for non-existent config options (we simply set them) + if (!isset($new[$config_key])) + { + $new[$config_key] = ''; + } + switch ($tpl_type[0]) { case 'text': @@ -301,7 +307,6 @@ function build_cfg_template($tpl_type, $key, &$new, $config_key, $vars) break; case 'select': - case 'select_multiple': case 'custom': $return = ''; @@ -340,21 +345,12 @@ function build_cfg_template($tpl_type, $key, &$new, $config_key, $vars) } else { - if ($tpl_type[0] == 'select_multiple') - { - $new[$config_key] = @unserialize(trim($new[$config_key])); - } - $args = array($new[$config_key], $key); } $return = call_user_func_array($call, $args); - if ($tpl_type[0] == 'select_multiple') - { - $tpl = '<select id="' . $key . '" name="' . $name . '[]" multiple="multiple">' . $return . '</select>'; - } - else if ($tpl_type[0] == 'select') + if ($tpl_type[0] == 'select') { $tpl = '<select id="' . $key . '" name="' . $name . '">' . $return . '</select>'; } |