diff options
| author | Nils Adermann <naderman@naderman.de> | 2012-02-21 20:20:01 +0100 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2012-02-21 20:20:01 +0100 |
| commit | a4090ba07c44000cf25c08c81b6e54bab88521c7 (patch) | |
| tree | 208182f2ccde31c7d28956de554c1146249639d0 | |
| parent | 625a1f2b20e77cbec4dd36605d4d3bf6e3273928 (diff) | |
| parent | 9f2a2a03a83f6d26ee6dc77debdba66dcab4d9a5 (diff) | |
| download | forums-a4090ba07c44000cf25c08c81b6e54bab88521c7.tar forums-a4090ba07c44000cf25c08c81b6e54bab88521c7.tar.gz forums-a4090ba07c44000cf25c08c81b6e54bab88521c7.tar.bz2 forums-a4090ba07c44000cf25c08c81b6e54bab88521c7.tar.xz forums-a4090ba07c44000cf25c08c81b6e54bab88521c7.zip | |
Merge remote-tracking branch 'github-cyberalien/ticket/10655' into develop
* github-cyberalien/ticket/10655:
[ticket/10655] Error in template inheritance test
| -rw-r--r-- | tests/template/template_inheritance_test.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/template/template_inheritance_test.php b/tests/template/template_inheritance_test.php index 3a03de6427..b637166ba6 100644 --- a/tests/template/template_inheritance_test.php +++ b/tests/template/template_inheritance_test.php @@ -71,6 +71,6 @@ class phpbb_template_template_inheritance_test extends phpbb_template_template_t $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'); } } |