diff options
| author | Lukas Reschke <lukas@owncloud.com> | 2015-01-13 11:03:58 +0100 |
|---|---|---|
| committer | Lukas Reschke <lukas@owncloud.com> | 2015-01-13 11:08:18 +0100 |
| commit | f0ac8a278ac8a6e07f7f4efb5455c4fb87996953 (patch) | |
| tree | bc476843411cc1a56ff7a26e45653abaa769ef6e | |
| parent | 5f7c115dfee58db718d0887562a5a8df8ccc7279 (diff) | |
| download | nextcloud-server-f0ac8a278ac8a6e07f7f4efb5455c4fb87996953.tar.gz nextcloud-server-f0ac8a278ac8a6e07f7f4efb5455c4fb87996953.zip | |
Use json_encode on string
It's better to encode the string to prevent possible (yet unknown) bugs in combination with PHP's type juggling.
Previously the boolean statements evaluated to either an empty string (false) or a not empty one (true, then it was 1). Not it always evaluates to false or true.
This also removes a stray - that was not intended there but shouldn't have produced any bugs. Just to increase readability.
Thanks @nickvergessen for spotting.
Addresses https://github.com/owncloud/core/pull/13235/files#r22852319
| -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]; |