mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-11 11:13:59 +02:00
Code Issues Releases Wiki Activity

Merge branch '3.2.x'

Browse Source
This commit is contained in:
Marc Alexander
2018-10-28 19:49:44 +01:00
parent a7a0bccc81 ed64a69760
commit 649b35fdcc
6 changed files with 137 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
tests/test_framework/phpbb_functional_test_case.php
View File

@@ -615,9 +615,10 @@ class phpbb_functional_test_case extends phpbb_test_case
* Creates a new user with limited permissions
*
* @param string $username Also doubles up as the user's password
* @param string $email User email (defaults to nobody@example.com)
* @return int ID of created user
*/
protected function create_user($username)
protected function create_user($username, $email = 'nobody@example.com')
{
// Required by unique_id
global $config;
@@ -669,7 +670,7 @@ class phpbb_functional_test_case extends phpbb_test_case
$user_row = array(
'username' => $username,
'group_id' => 2,
'user_email' => 'nobody@example.com',
'user_email' => $email,
'user_type' => 0,
'user_lang' => 'en',
'user_timezone' => 'UTC',