aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/questionnaire
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2017-12-11 21:56:21 +0100
committerMarc Alexander <admin@m-a-styles.de>2017-12-11 21:56:21 +0100
commit9f055e1af39f36ff18cc278093000cb30c858885 (patch)
tree0dbfa5caa2e26c2c71936d84639b23722a14c8db /phpBB/includes/questionnaire
parentb4ca1bdb0050b238797431f29faaefdc3057b50a (diff)
downloadforums-9f055e1af39f36ff18cc278093000cb30c858885.tar
forums-9f055e1af39f36ff18cc278093000cb30c858885.tar.gz
forums-9f055e1af39f36ff18cc278093000cb30c858885.tar.bz2
forums-9f055e1af39f36ff18cc278093000cb30c858885.tar.xz
forums-9f055e1af39f36ff18cc278093000cb30c858885.zip
[ticket/15322] Add config setting for -f parameter & remove mail function name
The -f parameter can now be added via configuration in the ACP. Addtionally, the config setting for the mail function name has been removed. PHPBB3-15322
Diffstat (limited to 'phpBB/includes/questionnaire')
-rw-r--r--phpBB/includes/questionnaire/questionnaire.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/questionnaire/questionnaire.php b/phpBB/includes/questionnaire/questionnaire.php
index 9699843db4..999200e0f2 100644
--- a/phpBB/includes/questionnaire/questionnaire.php
+++ b/phpBB/includes/questionnaire/questionnaire.php
@@ -337,7 +337,7 @@ class phpbb_questionnaire_phpbb_data_provider
'edit_time' => true,
'email_check_mx' => true,
'email_enable' => true,
- 'email_function_name' => true,
+ 'email_envelope_sender' => true,
'email_package_size' => true,
'enable_confirm' => true,
'enable_pm_icons' => true,