aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2013-12-04 15:56:03 +0100
committerJoas Schilling <nickvergessen@gmx.de>2013-12-04 15:56:03 +0100
commit0e93c2516c5905db2c1248688eba70d9495911a8 (patch)
tree9a6867da2770fec42b209268b0762c313148d73a
parent1977a10efbc468ea1afd021cdfc213e954932e3b (diff)
parente41cd384f533b8caa27fba10fedb89f9713c32b5 (diff)
downloadforums-0e93c2516c5905db2c1248688eba70d9495911a8.tar
forums-0e93c2516c5905db2c1248688eba70d9495911a8.tar.gz
forums-0e93c2516c5905db2c1248688eba70d9495911a8.tar.bz2
forums-0e93c2516c5905db2c1248688eba70d9495911a8.tar.xz
forums-0e93c2516c5905db2c1248688eba70d9495911a8.zip
Merge remote-tracking branch 'bantu/ticket/12056' into develop-olympus
* bantu/ticket/12056: [ticket/12056] Fix failure due to "Creating default object from empty value".
-rw-r--r--tests/functions/obtain_online_test.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/functions/obtain_online_test.php b/tests/functions/obtain_online_test.php
index b3beb55a96..de6451a0db 100644
--- a/tests/functions/obtain_online_test.php
+++ b/tests/functions/obtain_online_test.php
@@ -22,8 +22,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,