1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-12 03:34:04 +02:00

Merge branch '3.3.x'

This commit is contained in:
Marc Alexander
2019-12-29 15:11:29 +01:00
17 changed files with 43 additions and 20 deletions

View File

@@ -121,6 +121,8 @@ class phpbb_console_command_cron_run_test extends phpbb_database_test_case
public function test_no_task()
{
global $phpbb_root_path, $phpEx;
$tasks = array(
);
@@ -161,6 +163,8 @@ class phpbb_console_command_cron_run_test extends phpbb_database_test_case
public function test_no_task_verbose()
{
global $phpbb_root_path, $phpEx;
$tasks = array(
);

View File

@@ -112,7 +112,8 @@ abstract class phpbb_console_user_base extends phpbb_database_test_case
$row = $this->db->sql_fetchrow($result);
$this->db->sql_freeresult($result);
return $row['user_id'];
$user_id = $row ? $row['user_id'] : null;
return $user_id;
}
public function getInputStream($input)