mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-01 14:30:32 +02:00
Code Issues Releases Wiki Activity

Merge branch 'ticket/17422' into ticket/17422-master

Browse Source
This commit is contained in:
rxu
2024-10-31 15:08:08 +07:00
parent 7ab3bdba11 4194cb2228
commit 43de83b339
3 changed files with 41 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tests/test_framework/phpbb_functional_test_case.php
View File

@@ -1567,9 +1567,9 @@ class phpbb_functional_test_case extends phpbb_test_case
* @param string $username The username to check or empty if user_id is used
* @param int $user_id The user id to check or empty if username is used
*
* @return bool Returns true if a user exists, false otherwise
* @return array Returns user_id => username array or empty array if user does not exist
*/
protected function user_exists($username, $user_id = null)
protected function user_exists($username = '', $user_id = '')
{
global $db;
@@ -1584,6 +1584,8 @@ class phpbb_functional_test_case extends phpbb_test_case
require_once(__DIR__ . '/../../phpBB/includes/functions_user.php');
}
return user_get_id_name($user_id, $username) ? false : true;
user_get_id_name($user_id, $username, false, true);
return $username;
}
}