Merge pull request #34118 from owncloud/mitigate-preview-expiry

Skip preview expiry when owner cannot be determined
owncloud · Jan 21, 2019 · cef6e25 · cef6e25
2 parents 3d1e54d + 3921212
commit cef6e25
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/lib/private/Preview.php b/lib/private/Preview.php
@@ -1238,7 +1238,11 @@ public static function prepare_delete(array $args, $prefix = '') {
 		$path = Files\Filesystem::normalizePath($args['path']);
 		$user = isset($args['user']) ? $args['user'] : \OC_User::getUser();
 		if ($user === false) {
-			$user = Filesystem::getOwner($path);
+			try {
+				$user = Filesystem::getOwner($path);
+			} catch (NotFoundException $e) {
+				return;
+			}
 		}
 
 		$userFolder = \OC::$server->getUserFolder($user);
@@ -1308,7 +1312,11 @@ public static function post_delete($args, $prefix = '') {
 		if (!isset(self::$deleteFileMapper[$path])) {
 			$user = isset($args['user']) ? $args['user'] : \OC_User::getUser();
 			if ($user === false) {
-				$user = Filesystem::getOwner($path);
+				try {
+					$user = Filesystem::getOwner($path);
+				} catch (NotFoundException $e) {
+					return;
+				}
 			}
 
 			$userFolder = \OC::$server->getUserFolder($user);