diff options
| author | Igor Wiedler <igor@wiedler.ch> | 2012-11-17 19:49:03 +0100 |
|---|---|---|
| committer | Igor Wiedler <igor@wiedler.ch> | 2012-11-17 19:49:03 +0100 |
| commit | b5e069f8798a4ecd8f8b7d054932f63cdebb2a72 (patch) | |
| tree | 733554a9ef39a896a607d061fc82dfaf9582b538 /tests | |
| parent | e07db8fb8cd75acfb889e1c69874157a2782d1f6 (diff) | |
| parent | 7fdab9c5d7d212f206cfdd79f5ccef097070a7f5 (diff) | |
| download | forums-b5e069f8798a4ecd8f8b7d054932f63cdebb2a72.tar forums-b5e069f8798a4ecd8f8b7d054932f63cdebb2a72.tar.gz forums-b5e069f8798a4ecd8f8b7d054932f63cdebb2a72.tar.bz2 forums-b5e069f8798a4ecd8f8b7d054932f63cdebb2a72.tar.xz forums-b5e069f8798a4ecd8f8b7d054932f63cdebb2a72.zip | |
Merge remote-tracking branch 'p/ticket/10933' into develop
* p/ticket/10933:
[ticket/10933] Prose for get_first_file_location.
[ticket/10933] Remaining documentation for added functions in resource locator
[ticket/10933] Update template locator test to use style resource locator.
[ticket/10933] Dispose of locate function in template class.
[ticket/10933] Add mutators for template_path to style resource locator.
[ticket/10933] Delete template_path assignment.
[ticket/10933] Delete template_path from template class.
[ticket/10933] Add get_first_template_location.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/template/template_locate_test.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/template/template_locate_test.php b/tests/template/template_locate_test.php index be9ae06809..851dcae8ea 100644 --- a/tests/template/template_locate_test.php +++ b/tests/template/template_locate_test.php @@ -62,7 +62,7 @@ class phpbb_template_template_locate_test extends phpbb_template_template_test_c $this->setup_engine(); // Locate template - $result = $this->template->locate($files, $return_default, $return_full_path); + $result = $this->style_resource_locator->get_first_template_location($files, $return_default, $return_full_path); $this->assertSame($expected, $result); } } |