diff options
| -rw-r--r-- | lib/private/Files/View.php | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/lib/private/Files/View.php b/lib/private/Files/View.php index 71b453d299a..7fee0883a25 100644 --- a/lib/private/Files/View.php +++ b/lib/private/Files/View.php @@ -1941,11 +1941,18 @@ class View { ); } } catch (\OCP\Lock\LockedException $e) { - // rethrow with the a human-readable path - throw new \OCP\Lock\LockedException( - $this->getPathRelativeToFiles($absolutePath), - $e - ); + try { + // rethrow with the a human-readable path + throw new \OCP\Lock\LockedException( + $this->getPathRelativeToFiles($absolutePath), + $e + ); + } catch (\InvalidArgumentException $e) { + throw new \OCP\Lock\LockedException( + $absolutePath, + $e + ); + } } } @@ -2050,7 +2057,7 @@ class View { return ($pathSegments[2] === 'files') && (count($pathSegments) > 3); } - return true; + return strpos($path, '/appdata_') !== 0; } /** |