aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/questionnaire/questionnaire.php
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2009-12-16 15:48:23 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2009-12-16 15:48:23 +0000
commitb68de2323d6444b4b3685a98bbcb9500a38e45cb (patch)
tree6046a64891cfc1c2edb3f4b42b0e799f2921c155 /phpBB/includes/questionnaire/questionnaire.php
parent51d173ff1e6d3764be4701b92ecfd68007ad1c81 (diff)
downloadforums-b68de2323d6444b4b3685a98bbcb9500a38e45cb.tar
forums-b68de2323d6444b4b3685a98bbcb9500a38e45cb.tar.gz
forums-b68de2323d6444b4b3685a98bbcb9500a38e45cb.tar.bz2
forums-b68de2323d6444b4b3685a98bbcb9500a38e45cb.tar.xz
forums-b68de2323d6444b4b3685a98bbcb9500a38e45cb.zip
merge changes from 3.0.x branch
git-svn-id: file:///svn/phpbb/trunk@10342 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/questionnaire/questionnaire.php')
-rw-r--r--phpBB/includes/questionnaire/questionnaire.php1
1 files changed, 1 insertions, 0 deletions
diff --git a/phpBB/includes/questionnaire/questionnaire.php b/phpBB/includes/questionnaire/questionnaire.php
index 1d015576a7..659c088763 100644
--- a/phpBB/includes/questionnaire/questionnaire.php
+++ b/phpBB/includes/questionnaire/questionnaire.php
@@ -303,6 +303,7 @@ class phpbb_questionnaire_phpbb_data_provider
'database_gc' => true,
'dbms_version' => true,
'default_dateformat' => true,
+ 'default_lang' => true,
'display_last_edited' => true,
'display_order' => true,
'edit_time' => true,