diff options
| author | Nils Adermann <naderman@naderman.de> | 2014-08-11 18:13:57 +0200 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2014-08-11 18:13:57 +0200 |
| commit | 24dc0a66ebcf299c4165c4e42c5ec9cf9faa75f7 (patch) | |
| tree | 0c9b29617482a104e9c8afbd238a5e27ea7c6a74 | |
| parent | 837ed8b6e1b2a76a56ff487f7df9a4b9ef5afc60 (diff) | |
| parent | 96005ceb9e88eaf95cc818c6097e594a13b10533 (diff) | |
| download | forums-24dc0a66ebcf299c4165c4e42c5ec9cf9faa75f7.tar forums-24dc0a66ebcf299c4165c4e42c5ec9cf9faa75f7.tar.gz forums-24dc0a66ebcf299c4165c4e42c5ec9cf9faa75f7.tar.bz2 forums-24dc0a66ebcf299c4165c4e42c5ec9cf9faa75f7.tar.xz forums-24dc0a66ebcf299c4165c4e42c5ec9cf9faa75f7.zip | |
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
[ticket/12822] Correctly call \phpbb\user in avatar manager test
| -rw-r--r-- | tests/avatar/manager_test.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/avatar/manager_test.php b/tests/avatar/manager_test.php index 9f89968f36..81c153aed4 100644 --- a/tests/avatar/manager_test.php +++ b/tests/avatar/manager_test.php @@ -91,7 +91,7 @@ class phpbb_avatar_manager_test extends \phpbb_database_test_case // Set up avatar manager $this->manager = new \phpbb\avatar\manager($this->config, $avatar_drivers, $phpbb_container); $this->db = $this->new_dbal(); - $this->user = new \phpbb\user(); + $this->user = new \phpbb\user('\phpbb\datetime'); } protected function avatar_drivers() |