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
This commit is contained in:
Tristan Darricau 2017-02-05 18:11:22 +01:00
commit 59ad9401d9
No known key found for this signature in database
GPG key ID: 817043C2E29DB881

View file

@ -608,6 +608,6 @@ class file extends \phpbb\cache\driver\base
*/ */
protected function clean_varname($varname) protected function clean_varname($varname)
{ {
return str_replace('/', '-', $varname); return str_replace(array('/', '\\'), '-', $varname);
} }
} }