diff options
| author | Tristan Darricau <github@nicofuma.fr> | 2017-02-05 18:11:22 +0100 |
|---|---|---|
| committer | Tristan Darricau <github@nicofuma.fr> | 2017-02-05 18:11:22 +0100 |
| commit | 59ad9401d9db8c6b6612f01f7b295f12c4cdccf7 (patch) | |
| tree | 6c658c1da44885d9bba299c940857f6d6d0db95b /phpBB | |
| parent | 4eb72a4e7b6b3437f82fe4995b64ded6d0fdecef (diff) | |
| parent | 1470985ff20197589cbbab96180d80b0148d20d5 (diff) | |
| download | forums-59ad9401d9db8c6b6612f01f7b295f12c4cdccf7.tar forums-59ad9401d9db8c6b6612f01f7b295f12c4cdccf7.tar.gz forums-59ad9401d9db8c6b6612f01f7b295f12c4cdccf7.tar.bz2 forums-59ad9401d9db8c6b6612f01f7b295f12c4cdccf7.tar.xz forums-59ad9401d9db8c6b6612f01f7b295f12c4cdccf7.zip | |
Merge branch '3.1.x' into 3.2.x
* 3.1.x:
[ticket/13250] Use faster str_replace() instead of preg_replace()
[ticket/13250] Replace slashes in cache file names
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/phpbb/cache/driver/file.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/phpbb/cache/driver/file.php b/phpBB/phpbb/cache/driver/file.php index a210d877f0..497f00c06b 100644 --- a/phpBB/phpbb/cache/driver/file.php +++ b/phpBB/phpbb/cache/driver/file.php @@ -608,6 +608,6 @@ class file extends \phpbb\cache\driver\base */ protected function clean_varname($varname) { - return str_replace('/', '-', $varname); + return str_replace(array('/', '\\'), '-', $varname); } } |