diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2013-09-27 10:47:10 +0200 | 
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2013-09-27 10:47:10 +0200 | 
| commit | 663b4b2eb74e8edb076c962662ff5124e94353ea (patch) | |
| tree | 0ff449c776397b2b66fc7d567f93bbb7d62ea2e3 /tests/tree/nestedset_forum_base.php | |
| parent | 01512104b5823d15eed64d362b41b9594f870f0c (diff) | |
| parent | 8db820be634cfce0fdb079fdbaee2c49661a7870 (diff) | |
| download | forums-663b4b2eb74e8edb076c962662ff5124e94353ea.tar forums-663b4b2eb74e8edb076c962662ff5124e94353ea.tar.gz forums-663b4b2eb74e8edb076c962662ff5124e94353ea.tar.bz2 forums-663b4b2eb74e8edb076c962662ff5124e94353ea.tar.xz forums-663b4b2eb74e8edb076c962662ff5124e94353ea.zip | |
Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/passwords
Conflicts:
	phpBB/develop/create_schema_files.php
Diffstat (limited to 'tests/tree/nestedset_forum_base.php')
| -rw-r--r-- | tests/tree/nestedset_forum_base.php | 8 | 
1 files changed, 4 insertions, 4 deletions
| diff --git a/tests/tree/nestedset_forum_base.php b/tests/tree/nestedset_forum_base.php index 43680609f8..ce03c1fc21 100644 --- a/tests/tree/nestedset_forum_base.php +++ b/tests/tree/nestedset_forum_base.php @@ -52,11 +52,11 @@ class phpbb_tests_tree_nestedset_forum_base extends phpbb_database_test_case  		global $config; -		$config = $this->config = new phpbb_config(array('nestedset_forum_lock' => 0)); +		$config = $this->config = new \phpbb\config\config(array('nestedset_forum_lock' => 0));  		set_config(null, null, null, $this->config); -		$this->lock = new phpbb_lock_db('nestedset_forum_lock', $this->config, $this->db); -		$this->set = new phpbb_tree_nestedset_forum($this->db, $this->lock, 'phpbb_forums'); +		$this->lock = new \phpbb\lock\db('nestedset_forum_lock', $this->config, $this->db); +		$this->set = new \phpbb\tree\nestedset_forum($this->db, $this->lock, 'phpbb_forums');  		$this->set_up_forums();  	} @@ -97,7 +97,7 @@ class phpbb_tests_tree_nestedset_forum_base extends phpbb_database_test_case  		}  		else  		{ -			$buffer = new phpbb_db_sql_insert_buffer($this->db, 'phpbb_forums'); +			$buffer = new \phpbb\db\sql_insert_buffer($this->db, 'phpbb_forums');  			$buffer->insert_all($forums);  			$buffer->flush(); | 
