aboutsummaryrefslogtreecommitdiffstats
path: root/tests/test_framework/phpbb_functional_test_case.php
diff options
context:
space:
mode:
authorOleg Pudeyev <oleg@bsdpower.com>2012-02-03 16:21:51 -0500
committerOleg Pudeyev <oleg@bsdpower.com>2012-02-03 16:21:51 -0500
commitcddd63aae045a833e9a3ec4bb396b3987f95cbd3 (patch)
tree69ac84e41f9333ec540fddb1d428c5bac97c0fd4 /tests/test_framework/phpbb_functional_test_case.php
parent6ad87d3aaf04fba5e58351c18fc78d1a9ee77dbb (diff)
parentccf0cf649daabc600e8a79680e29c7bfbba32cac (diff)
downloadforums-cddd63aae045a833e9a3ec4bb396b3987f95cbd3.tar
forums-cddd63aae045a833e9a3ec4bb396b3987f95cbd3.tar.gz
forums-cddd63aae045a833e9a3ec4bb396b3987f95cbd3.tar.bz2
forums-cddd63aae045a833e9a3ec4bb396b3987f95cbd3.tar.xz
forums-cddd63aae045a833e9a3ec4bb396b3987f95cbd3.zip
Merge remote-tracking branch 'imkingdavid/ticket/10535' into develop
* imkingdavid/ticket/10535: [ticket/10535] Delete no longer needed email confirm language entries. [ticket/10535] Delete email confirm from installer [ticket/10535] Removed email confirm field from acp_users module [ticket/10535] Forgot a subsilver2 change. *doh* [ticket/10535] Removed email confirm from UCP, removed unused language entries [ticket/10535] Remove email confirm check on registration form
Diffstat (limited to 'tests/test_framework/phpbb_functional_test_case.php')
-rw-r--r--tests/test_framework/phpbb_functional_test_case.php3
1 files changed, 1 insertions, 2 deletions
diff --git a/tests/test_framework/phpbb_functional_test_case.php b/tests/test_framework/phpbb_functional_test_case.php
index ca52d24b7e..b5e6f7e377 100644
--- a/tests/test_framework/phpbb_functional_test_case.php
+++ b/tests/test_framework/phpbb_functional_test_case.php
@@ -102,8 +102,7 @@ class phpbb_functional_test_case extends phpbb_test_case
'admin_name' => 'admin',
'admin_pass1' => 'admin',
'admin_pass2' => 'admin',
- 'board_email1' => 'nobody@example.com',
- 'board_email2' => 'nobody@example.com',
+ 'board_email' => 'nobody@example.com',
));
$parseURL = parse_url(self::$config['phpbb_functional_url']);