aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
diff options
context:
space:
mode:
authorNils Adermann <naderman@naderman.de>2009-07-26 11:33:48 +0000
committerNils Adermann <naderman@naderman.de>2009-07-26 11:33:48 +0000
commit4faf662623fdc9956604049c57499546149f3655 (patch)
tree99cc3fc196a693f86eed802ba0cbb9f806e6e597 /phpBB/includes
parentba37fa4f49c17047da9aeeb8ada5efaf1030e795 (diff)
downloadforums-4faf662623fdc9956604049c57499546149f3655.tar
forums-4faf662623fdc9956604049c57499546149f3655.tar.gz
forums-4faf662623fdc9956604049c57499546149f3655.tar.bz2
forums-4faf662623fdc9956604049c57499546149f3655.tar.xz
forums-4faf662623fdc9956604049c57499546149f3655.zip
made a mistake when turning stats into a whitelist
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9856 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes')
-rw-r--r--phpBB/includes/questionnaire/questionnaire.php7
1 files changed, 4 insertions, 3 deletions
diff --git a/phpBB/includes/questionnaire/questionnaire.php b/phpBB/includes/questionnaire/questionnaire.php
index fe6e8a3bd7..88873efdc5 100644
--- a/phpBB/includes/questionnaire/questionnaire.php
+++ b/phpBB/includes/questionnaire/questionnaire.php
@@ -253,6 +253,7 @@ class phpbb_questionnaire_phpbb_data_provider
'allow_namechange' => true,
'allow_nocensors' => true,
'allow_pm_attach' => true,
+ 'allow_pm_report' => true,
'allow_post_flash' => true,
'allow_post_links' => true,
'allow_privmsg' => true,
@@ -435,11 +436,11 @@ class phpbb_questionnaire_phpbb_data_provider
);
$result = array();
- foreach ($this->config as $name => $value)
+ foreach ($config_vars as $name => $void)
{
- if (!isset($exclude_config_vars[$name]))
+ if (isset($this->config[$name]))
{
- $result['config.' . $name] = $value;
+ $result['config.' . $name] = $this->config[$name];
}
}