Merge branch 'develop-olympus' into develop

* 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

View file

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