Merge remote-tracking branch 'github-cyberalien/ticket/10655' into develop

* github-cyberalien/ticket/10655:
  [ticket/10655] Error in template inheritance test
This commit is contained in:
Nils Adermann 2012-02-21 20:20:01 +01:00
commit a4090ba07c

View file

@ -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');
}
}