diff options
| author | Vincent Petry <pvince81@owncloud.com> | 2015-05-29 13:15:12 +0200 |
|---|---|---|
| committer | Vincent Petry <pvince81@owncloud.com> | 2015-05-29 13:15:12 +0200 |
| commit | 9a6d253af39dba49a1397416fb448e922df8a7a1 (patch) | |
| tree | 18b6c00c1cb6a4d7eebe0c48998381956f1268b7 /apps/files_versions/lib/storage.php | |
| parent | 173b14730556d1b32d06e6b362c65b4a6dabb178 (diff) | |
| download | nextcloud-server-9a6d253af39dba49a1397416fb448e922df8a7a1.tar.gz nextcloud-server-9a6d253af39dba49a1397416fb448e922df8a7a1.zip | |
Abort expiration when file is gone
Sometimes a background job for versions expiration was scheduled for a
file that has been moved or deleted since.
This prevents showing useless warnings in the log and simply bail out.
Diffstat (limited to 'apps/files_versions/lib/storage.php')
| -rw-r--r-- | apps/files_versions/lib/storage.php | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/apps/files_versions/lib/storage.php b/apps/files_versions/lib/storage.php index 98e486690b6..296cebfe058 100644 --- a/apps/files_versions/lib/storage.php +++ b/apps/files_versions/lib/storage.php @@ -346,7 +346,7 @@ class Storage { */ public static function getVersions($uid, $filename, $userFullPath = '') { $versions = array(); - if ($filename === '') { + if (empty($filename)) { return $versions; } // fetch for old versions @@ -556,6 +556,10 @@ class Storage { $config = \OC::$server->getConfig(); if($config->getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true') { list($uid, $filename) = self::getUidAndFilename($filename); + if (empty($filename)) { + // file maybe renamed or deleted + return false; + } $versionsFileview = new \OC\Files\View('/'.$uid.'/files_versions'); // get available disk space for user |