diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2016-02-11 23:40:18 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2016-02-11 23:40:18 +0100 |
| commit | 971fe13a2893bf9ff550d2ae60de9613d56dda62 (patch) | |
| tree | 9e29883c4c61c7cf47048048abbc6637a646fe09 /tests | |
| parent | c9e5d308f2ebaae5ddaa70faf25af93fe2eb368b (diff) | |
| parent | 5557760eccab67515990622471bd5de297e40f1e (diff) | |
| download | forums-971fe13a2893bf9ff550d2ae60de9613d56dda62.tar forums-971fe13a2893bf9ff550d2ae60de9613d56dda62.tar.gz forums-971fe13a2893bf9ff550d2ae60de9613d56dda62.tar.bz2 forums-971fe13a2893bf9ff550d2ae60de9613d56dda62.tar.xz forums-971fe13a2893bf9ff550d2ae60de9613d56dda62.zip | |
Merge pull request #4160 from Nicofuma/ticket/14440
[ticket/14440] Correctly remove the web root path in update_web_root_path
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/path_helper/path_helper_test.php | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/tests/path_helper/path_helper_test.php b/tests/path_helper/path_helper_test.php index 007441bc92..49dd40fbec 100644 --- a/tests/path_helper/path_helper_test.php +++ b/tests/path_helper/path_helper_test.php @@ -135,6 +135,43 @@ class phpbb_path_helper_test extends phpbb_test_case '/phpbb3-fork/phpBB/app.php', './../', ), + + // No correction if the path is already prepend by the web root path + array( + './../' . $this->phpbb_root_path . 'test.php', + '//', + null, + null, + '', + ), + array( + './../' . $this->phpbb_root_path . 'test.php', + '//', + 'foo/bar.php', + 'bar.php', + '', + ), + array( + './../../' . $this->phpbb_root_path . 'test.php', + '/foo/template', + '/phpbb3-fork/phpBB/app.php/foo/template', + '/phpbb3-fork/phpBB/app.php', + '', + ), + array( + './../' . $this->phpbb_root_path . 'test.php', + '/foo/template', + '/phpbb3-fork/phpBB/foo/template', + '/phpbb3-fork/phpBB/app.php', + '', + ), + array( + './../'.$this->phpbb_root_path . 'test.php', + '/', + '/phpbb3-fork/phpBB/app.php/', + '/phpbb3-fork/phpBB/app.php', + '', + ), ); } |