diff options
| author | Nils Adermann <naderman@naderman.de> | 2010-03-26 18:28:48 +0100 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2010-03-26 18:28:48 +0100 |
| commit | d702dba75e14a909c165c7ca7a6a87207dcadaaf (patch) | |
| tree | 3b6e3ccf41abad007b9581677d674c297bb267a5 /tests/template | |
| parent | 2c635b473bb06f07c643e120b5a6cbaaf9923e98 (diff) | |
| parent | d79cff235c761d10c148eb1434ce72289f4327a0 (diff) | |
| download | forums-d702dba75e14a909c165c7ca7a6a87207dcadaaf.tar forums-d702dba75e14a909c165c7ca7a6a87207dcadaaf.tar.gz forums-d702dba75e14a909c165c7ca7a6a87207dcadaaf.tar.bz2 forums-d702dba75e14a909c165c7ca7a6a87207dcadaaf.tar.xz forums-d702dba75e14a909c165c7ca7a6a87207dcadaaf.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[develop-olympus] Make this test run on windows with backslash-paths.
[bug/56965] Redirect fails with directory traversal
[bug/58685] Correct spelling errors in append_sid() comments.
[bug/58025] Search robots are now redirected if they send a SID in the request
Diffstat (limited to 'tests/template')
| -rw-r--r-- | tests/template/template.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/template/template.php b/tests/template/template.php index 81caaf33b2..9436ab2d98 100644 --- a/tests/template/template.php +++ b/tests/template/template.php @@ -256,7 +256,7 @@ class phpbb_template_template_test extends phpbb_test_case $this->template->set_filenames(array('test' => $filename)); $this->assertFileNotExists($this->template_path . '/' . $filename, 'Testing missing file, file cannot exist'); - $expecting = sprintf('template->_tpl_load_file(): File %s does not exist or is empty', realpath($this->template_path) . '/' . $filename); + $expecting = sprintf('template->_tpl_load_file(): File %s does not exist or is empty', realpath($this->template_path . '/../') . '/templates/' . $filename); $this->setExpectedTriggerError(E_USER_ERROR, $expecting); $this->display('test'); |