diff options
| author | Robin McCorkell <rmccorkell@karoshi.org.uk> | 2015-01-13 10:39:14 +0000 |
|---|---|---|
| committer | Robin McCorkell <rmccorkell@karoshi.org.uk> | 2015-01-13 10:39:14 +0000 |
| commit | 79804166f18d1426b0aeb3aa03296ad548112585 (patch) | |
| tree | 66c8d97fadb5f3a9d074ce475a5dc7d0a3e3d1a2 /lib | |
| parent | dc86cbd1e275f01840b304751a02ecbe4043c51e (diff) | |
| parent | f0ac8a278ac8a6e07f7f4efb5455c4fb87996953 (diff) | |
| download | nextcloud-server-79804166f18d1426b0aeb3aa03296ad548112585.tar.gz nextcloud-server-79804166f18d1426b0aeb3aa03296ad548112585.zip | |
Merge pull request #13305 from owncloud/remove-stray-minus-and-use-json-encode
Use json_encode on string
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/private/files/filesystem.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/private/files/filesystem.php b/lib/private/files/filesystem.php index 100b364ca06..f90b2738d03 100644 --- a/lib/private/files/filesystem.php +++ b/lib/private/files/filesystem.php @@ -715,7 +715,7 @@ class Filesystem { * @return string */ public static function normalizePath($path, $stripTrailingSlash = true, $isAbsolutePath = false) { - $cacheKey = $path.'-'.-$stripTrailingSlash.'-'.$isAbsolutePath; + $cacheKey = json_encode([$path, $stripTrailingSlash, $isAbsolutePath]); if(isset(self::$normalizedPathCache[$cacheKey])) { return self::$normalizedPathCache[$cacheKey]; |