summaryrefslogtreecommitdiffstats
path: root/lib/private
diff options
context:
space:
mode:
authorVincent Petry <pvince81@owncloud.com>2016-06-02 15:18:13 +0200
committerVincent Petry <pvince81@owncloud.com>2016-06-02 15:18:13 +0200
commit1ab7ee5e231b85ffdb24c284e57cebdd030b8a3d (patch)
treef5ff7c4b171495337972e8595385819ed2937b5b /lib/private
parent53398b5146b566e55874b86171643a8dfddd34c1 (diff)
parent5b1eb416d87c0e85e60547003f9b01847c81ec8a (diff)
downloadnextcloud-server-1ab7ee5e231b85ffdb24c284e57cebdd030b8a3d.tar.gz
nextcloud-server-1ab7ee5e231b85ffdb24c284e57cebdd030b8a3d.zip
Merge pull request #24940 from owncloud/fix-normalizedcachekey-keepunicode
Add keepUnicode value in the cache key of normalizedPathCache
Diffstat (limited to 'lib/private')
-rw-r--r--lib/private/Files/Filesystem.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/private/Files/Filesystem.php b/lib/private/Files/Filesystem.php
index 08621d160be..3d3345a5c80 100644
--- a/lib/private/Files/Filesystem.php
+++ b/lib/private/Files/Filesystem.php
@@ -781,7 +781,7 @@ class Filesystem {
*/
$path = (string)$path;
- $cacheKey = json_encode([$path, $stripTrailingSlash, $isAbsolutePath]);
+ $cacheKey = json_encode([$path, $stripTrailingSlash, $isAbsolutePath, $keepUnicode]);
if (isset(self::$normalizedPathCache[$cacheKey])) {
return self::$normalizedPathCache[$cacheKey];