diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2014-06-26 15:07:05 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2014-06-26 15:07:05 +0200 |
| commit | 9b27d00d5fc8228ec4f9150aa26bcf450dc45524 (patch) | |
| tree | e2c97576903b834d04178c6d15db419bbd3497c2 /phpBB/phpbb/filesystem.php | |
| parent | 69b9aa2859441116c02ea0b36f6f3a53b8c1eda1 (diff) | |
| parent | e71f65c2bb8a810f669b275856cf7e3654d34810 (diff) | |
| download | forums-9b27d00d5fc8228ec4f9150aa26bcf450dc45524.tar forums-9b27d00d5fc8228ec4f9150aa26bcf450dc45524.tar.gz forums-9b27d00d5fc8228ec4f9150aa26bcf450dc45524.tar.bz2 forums-9b27d00d5fc8228ec4f9150aa26bcf450dc45524.tar.xz forums-9b27d00d5fc8228ec4f9150aa26bcf450dc45524.zip | |
Merge remote-tracking branch 'nickvergessen/ticket/12099' into develop-ascraeus
* nickvergessen/ticket/12099:
[ticket/12099] Fix correction in path_helper test
[ticket/12099] Prepend ./ to path to fix assets
[ticket/12099] Deduplicate path generation
[ticket/12099] Fix clean_path() ".." stripping when previous directory was "."
[ticket/12099] Break clean_path tests with a simple test
[ticket/12099] Clean paths in tests
[ticket/12099] Correctly fix go back to root before prepending the root path
[ticket/12099] Clean some paths before using them
[ticket/12099] Fix several issues in path_helper test
Diffstat (limited to 'phpBB/phpbb/filesystem.php')
| -rw-r--r-- | phpBB/phpbb/filesystem.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/phpbb/filesystem.php b/phpBB/phpbb/filesystem.php index 683a12ab76..77517082e5 100644 --- a/phpBB/phpbb/filesystem.php +++ b/phpBB/phpbb/filesystem.php @@ -35,7 +35,7 @@ class filesystem continue; } - if ($part === '..' && !empty($filtered) && $filtered[sizeof($filtered) - 1] !== '..') + if ($part === '..' && !empty($filtered) && $filtered[sizeof($filtered) - 1] !== '.' && $filtered[sizeof($filtered) - 1] !== '..') { array_pop($filtered); } |