diff options
| author | Robin Appelman <icewind@owncloud.com> | 2015-07-17 13:18:01 +0200 |
|---|---|---|
| committer | Robin Appelman <icewind@owncloud.com> | 2015-10-01 13:14:47 +0200 |
| commit | f4d180ee5c6be5b3d061a035299079fc675b945f (patch) | |
| tree | a2044cb77affc104fd67191a768997ea72af6e5f | |
| parent | 64994facce890e53a50bc75047e502e434c9c749 (diff) | |
| download | nextcloud-server-f4d180ee5c6be5b3d061a035299079fc675b945f.tar.gz nextcloud-server-f4d180ee5c6be5b3d061a035299079fc675b945f.zip | |
allow passing the fileinfo to the preview manager
| -rw-r--r-- | core/ajax/preview.php | 2 | ||||
| -rw-r--r-- | lib/private/preview.php | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/core/ajax/preview.php b/core/ajax/preview.php index c8bc05453ed..b6362fb3a70 100644 --- a/core/ajax/preview.php +++ b/core/ajax/preview.php @@ -53,7 +53,7 @@ if (!$info instanceof OCP\Files\FileInfo || !$always && !\OC::$server->getPrevie \OC_Response::setStatus(404); } else { $preview = new \OC\Preview(\OC_User::getUser(), 'files'); - $preview->setFile($file); + $preview->setFile($file, $info); $preview->setMaxX($maxX); $preview->setMaxY($maxY); $preview->setScalingUp($scalingUp); diff --git a/lib/private/preview.php b/lib/private/preview.php index 1127048b7fd..996bf81703b 100644 --- a/lib/private/preview.php +++ b/lib/private/preview.php @@ -252,12 +252,13 @@ class Preview { * Sets the path of the file you want a preview of * * @param string $file + * @param \OCP\Files\FileInfo|null $info * * @return \OC\Preview */ - public function setFile($file) { + public function setFile($file, $info = null) { $this->file = $file; - $this->info = null; + $this->info = $info; if ($file !== '') { $this->getFileInfo(); |