[Pkg-owncloud-commits] [owncloud] 01/145: Fixed isPreviewAvailable warnings in log
David Prévot
taffit at moszumanska.debian.org
Wed Feb 26 16:27:37 UTC 2014
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to branch master
in repository owncloud.
commit 099ccfa2544bb0d70d974d502552ff8ba79c8ebd
Author: Vincent Petry <pvince81 at owncloud.com>
Date: Fri Jan 17 14:21:15 2014 +0100
Fixed isPreviewAvailable warnings in log
isPreviewAvailable wasn't always set as the files formatting code is
slightly different than the one from the files app.
Fixes #6423
Backport of f4c198b to stable6
---
apps/files/templates/part.list.php | 2 +-
apps/files_sharing/public.php | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/apps/files/templates/part.list.php b/apps/files/templates/part.list.php
index 2f630e1..f4fb96a 100644
--- a/apps/files/templates/part.list.php
+++ b/apps/files/templates/part.list.php
@@ -18,7 +18,7 @@ $totalsize = 0; ?>
data-size="<?php p($file['size']);?>"
data-etag="<?php p($file['etag']);?>"
data-permissions="<?php p($file['permissions']); ?>">
- <?php if($file['isPreviewAvailable']): ?>
+ <?php if(isset($file['isPreviewAvailable']) and $file['isPreviewAvailable']): ?>
<td class="filename svg preview-icon"
<?php else: ?>
<td class="filename svg"
diff --git a/apps/files_sharing/public.php b/apps/files_sharing/public.php
index 2e1381d..2407903 100644
--- a/apps/files_sharing/public.php
+++ b/apps/files_sharing/public.php
@@ -188,8 +188,8 @@ if (isset($path)) {
} else {
$i['extension'] = '';
}
- $i['isPreviewAvailable'] = \OC::$server->getPreviewManager()->isMimeSupported($i['mimetype']);
}
+ $i['isPreviewAvailable'] = \OC::$server->getPreviewManager()->isMimeSupported($i['mimetype']);
$i['directory'] = $getPath;
$i['permissions'] = OCP\PERMISSION_READ;
$i['icon'] = determineIcon($i, $basePath, $token);
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git
More information about the Pkg-owncloud-commits
mailing list