summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorThomas Müller <thomas.mueller@tmit.eu>2013-11-04 23:58:42 -0800
committerThomas Müller <thomas.mueller@tmit.eu>2013-11-04 23:58:42 -0800
commitd48ba5a5bf0668690e54d4ed68f8aa31d8946cf9 (patch)
tree8c9f2e438277dfd9a1f0c9ea1f24155619ab532f /apps
parentb767bbcddacc62741e8bed585c080092448bb829 (diff)
parenta7cb16aab1f100995a417e74111371835622478d (diff)
downloadnextcloud-server-d48ba5a5bf0668690e54d4ed68f8aa31d8946cf9.tar.gz
nextcloud-server-d48ba5a5bf0668690e54d4ed68f8aa31d8946cf9.zip
Merge pull request #5540 from owncloud/scanner-enhancments-master
Scanner enhancments master
Diffstat (limited to 'apps')
-rw-r--r--apps/files_sharing/lib/cache.php4
1 files changed, 4 insertions, 0 deletions
diff --git a/apps/files_sharing/lib/cache.php b/apps/files_sharing/lib/cache.php
index 6b66edcacc5..90440d08f4e 100644
--- a/apps/files_sharing/lib/cache.php
+++ b/apps/files_sharing/lib/cache.php
@@ -99,9 +99,13 @@ class Shared_Cache extends Cache {
$data['fileid'] = (int)$data['fileid'];
$data['size'] = (int)$data['size'];
$data['mtime'] = (int)$data['mtime'];
+ $data['storage_mtime'] = (int)$data['storage_mtime'];
$data['encrypted'] = (bool)$data['encrypted'];
$data['mimetype'] = $this->getMimetype($data['mimetype']);
$data['mimepart'] = $this->getMimetype($data['mimepart']);
+ if ($data['storage_mtime'] === 0) {
+ $data['storage_mtime'] = $data['mtime'];
+ }
return $data;
}
return false;