makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-08 04:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop-olympus' into develop

Browse source 
* develop-olympus:
  [ticket/12056] Fix failure due to "Creating default object from empty value".
This commit is contained in:
Joas Schilling 2013-12-04 15:57:25 +01:00
commit 8087a76c36
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
tests/functions/obtain_online_test.php
View file

@ -21,8 +21,9 @@ class phpbb_functions_obtain_online_test extends phpbb_database_test_case
{ {
parent::setUp(); parent::setUp();
global $config, $db; global $config, $db, $user;
$user = new StdClass;
$db = $this->db = $this->new_dbal(); $db = $this->db = $this->new_dbal();
$config = array( $config = array(
'load_online_time' => 5, 'load_online_time' => 5,