Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/gallery.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlivier Paroz <github@oparoz.com>2015-03-16 02:48:42 +0300
committerOlivier Paroz <github@oparoz.com>2015-03-16 02:48:42 +0300
commit4efcbd8e8b0f153ebdfd83999c30b6f9dc311e62 (patch)
treeda2093b6e0f7f62d6f719b3d0d5ca47d1e87fb4c /preview
parent0dd0bd2af15828f26abfb1ffb01fd67a70f5785c (diff)
Various style fixes
Diffstat (limited to 'preview')
-rw-r--r--preview/preview.php9
1 files changed, 4 insertions, 5 deletions
diff --git a/preview/preview.php b/preview/preview.php
index 634d6306..4ac1a0b9 100644
--- a/preview/preview.php
+++ b/preview/preview.php
@@ -123,18 +123,17 @@ class Preview {
*/
public function preparePreview($maxX, $maxY, $keepAspect) {
$this->dims = [$maxX, $maxY];
- $perfectPreview = [];
$previewData = $this->getPreviewFromCore($keepAspect);
if ($previewData && $previewData->valid()) {
- $perfectPreview['preview'] = $previewData;
+ $mimeType = $previewData->mimeType();
} else {
- $perfectPreview['preview'] = $this->getMimeIcon();
+ $previewData = $this->getMimeIcon();
+ $mimeType = 'image/png';
}
- $perfectPreview['mimetype'] = 'image/png'; // Previews are always sent as PNG
- return $perfectPreview;
+ return ['preview' => $previewData, 'mimetype' => $mimeType];
}
/**