diff options
author | Vincent Petry <pvince81@owncloud.com> | 2014-01-29 02:21:30 -0800 |
---|---|---|
committer | Vincent Petry <pvince81@owncloud.com> | 2014-01-29 02:21:30 -0800 |
commit | a2b79ead2dad807779c51a32cf880fe0bd33d3bc (patch) | |
tree | 26ff98195ed1db986c3fc9837cdc1bcf1f9fa32c /apps/files/lib | |
parent | cf2c061f1f2577b3a995d9e2423c93589d7df2b3 (diff) | |
parent | e6f93fc84140931d13c8e77b12fd6ec53a04457a (diff) | |
download | nextcloud-server-a2b79ead2dad807779c51a32cf880fe0bd33d3bc.tar.gz nextcloud-server-a2b79ead2dad807779c51a32cf880fe0bd33d3bc.zip |
Merge pull request #6990 from owncloud/files-fixrenamewarnings
Fix warnings in logs when renaming over the web UI
Diffstat (limited to 'apps/files/lib')
-rw-r--r-- | apps/files/lib/app.php | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/apps/files/lib/app.php b/apps/files/lib/app.php index e04ac173d55..1ac266073db 100644 --- a/apps/files/lib/app.php +++ b/apps/files/lib/app.php @@ -83,14 +83,17 @@ class App { else { $meta['type'] = 'file'; } + // these need to be set for determineIcon() + $meta['isPreviewAvailable'] = \OC::$server->getPreviewManager()->isMimeSupported($meta['mimetype']); + $meta['directory'] = $dir; $fileinfo = array( 'id' => $meta['fileid'], 'mime' => $meta['mimetype'], 'size' => $meta['size'], 'etag' => $meta['etag'], - 'directory' => $dir, + 'directory' => $meta['directory'], 'name' => $newname, - 'isPreviewAvailable' => \OC::$server->getPreviewManager()->isMimeSupported($meta['mimetype']), + 'isPreviewAvailable' => $meta['isPreviewAvailable'], 'icon' => \OCA\Files\Helper::determineIcon($meta) ); $result['success'] = true; |