diff options
| author | Igor Wiedler <igor@wiedler.ch> | 2012-03-11 15:18:33 +0100 |
|---|---|---|
| committer | Igor Wiedler <igor@wiedler.ch> | 2012-03-11 15:18:33 +0100 |
| commit | ae984025f0575554bb78fef9dcf66233748e97c8 (patch) | |
| tree | 633c4940c92626dfbd06efa70987f99e03bd0b28 /tests/template/template_inheritance_test.php | |
| parent | e02d92ac62fbe1dc08994444c18a7447d72c56e6 (diff) | |
| parent | 3850b05fbb9a292957e41023fcea797191442692 (diff) | |
| download | forums-ae984025f0575554bb78fef9dcf66233748e97c8.tar forums-ae984025f0575554bb78fef9dcf66233748e97c8.tar.gz forums-ae984025f0575554bb78fef9dcf66233748e97c8.tar.bz2 forums-ae984025f0575554bb78fef9dcf66233748e97c8.tar.xz forums-ae984025f0575554bb78fef9dcf66233748e97c8.zip | |
Merge branch 'develop' into feature/event-dispatcher
* develop: (95 commits)
[ticket/9084] Explain the logic.
[ticket/10653] Call get_row_count of base class in mysql get_estimated_row_count
[ticket/9813] Only get posts table row count if we detected a fulltext index.
[feature/append_var] Adding test case
[ticket/7432] Delete redundant reference to "appropriate menu item".
[ticket/10618] Change phpBB 3 to phpBB 3.1.
[ticket/10685] Refactor template test defaults for php 5.4 compatibility.
[feature/append_var] Adding append_var template class function
[ticket/9813] Also use estimated row count of posts table for fulltext mysql.
[ticket/10653] Fix parameter to substr() in unit tests. Should be 1, not -1.
[ticket/10653] Unit tests for get_row_count() and get_estimated_row_count().
[ticket/10653] Add ability to count table rows to database abstraction layer.
[ticket/9813] Use table status row count only if greater than 100000 or exact.
[ticket/9813] Use SHOW TABLE STATUS to get search stats for native on MySQL.
[ticket/8652] Comment for also updating forum watch table in user_notification.
[ticket/8652] Sending 2 emails on 2 replies
[ticket/10680] Add /phpBB/ext/* to .gitignore
[ticket/10672] Fix total post count language string in statistics and feed
[ticket/9220] Remove margin on table.table1 so it's centered in the blue box.
[ticket/10453] Fixing spacing
...
Conflicts:
tests/bootstrap.php
Diffstat (limited to 'tests/template/template_inheritance_test.php')
| -rw-r--r-- | tests/template/template_inheritance_test.php | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/tests/template/template_inheritance_test.php b/tests/template/template_inheritance_test.php index 3a03de6427..6987ae6c73 100644 --- a/tests/template/template_inheritance_test.php +++ b/tests/template/template_inheritance_test.php @@ -62,15 +62,18 @@ class phpbb_template_template_inheritance_test extends phpbb_template_template_t $this->run_template($file, $vars, $block_vars, $destroy, $expected, $cache_file); } - protected function setup_engine() + protected function setup_engine(array $new_config = array()) { - global $phpbb_root_path, $phpEx, $config, $user; + global $phpbb_root_path, $phpEx, $user; + + $defaults = $this->config_defaults(); + $config = new phpbb_config(array_merge($defaults, $new_config)); $this->template_path = dirname(__FILE__) . '/templates'; $this->parent_template_path = dirname(__FILE__) . '/parent_templates'; $this->template_locator = new phpbb_template_locator(); $this->template_provider = new phpbb_template_path_provider(); $this->template = new phpbb_template($phpbb_root_path, $phpEx, $config, $user, $this->template_locator, $this->template_provider); - $this->template->set_custom_template($this->template_path, 'tests', $this->parent_template_path); + $this->template->set_custom_template($this->template_path, 'tests', $this->parent_template_path, 'parent'); } } |