aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2013-12-04 15:57:25 +0100
committerJoas Schilling <nickvergessen@gmx.de>2013-12-04 15:57:25 +0100
commit8087a76c36a15b915b7f8b0d68b18768aada3589 (patch)
treef0e6dc6b31d6c3d96c994f7cfefe5fc0fe2b2694 /tests
parent8b2d515736ffc9e9497e35f0db2e8357f91805d5 (diff)
parent0e93c2516c5905db2c1248688eba70d9495911a8 (diff)
downloadforums-8087a76c36a15b915b7f8b0d68b18768aada3589.tar
forums-8087a76c36a15b915b7f8b0d68b18768aada3589.tar.gz
forums-8087a76c36a15b915b7f8b0d68b18768aada3589.tar.bz2
forums-8087a76c36a15b915b7f8b0d68b18768aada3589.tar.xz
forums-8087a76c36a15b915b7f8b0d68b18768aada3589.zip
Merge branch 'develop-olympus' into develop
* develop-olympus: [ticket/12056] Fix failure due to "Creating default object from empty value".
Diffstat (limited to 'tests')
-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 624e05f77f..cf42fd5b58 100644
--- a/tests/functions/obtain_online_test.php
+++ b/tests/functions/obtain_online_test.php
@@ -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,