From 266fbb442ebefbec92d159204833848edf314fcf Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Thu, 26 Jan 2012 18:12:59 +0100
Subject: [PATCH] use oc_filesystem::getlocalfile instead of manually trying to
get the correct local file when creating album covers
fixes broken album covers on shared files
---
apps/gallery/ajax/cover.php | 6 +++---
apps/gallery/lib/scanner.php | 3 ++-
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/apps/gallery/ajax/cover.php b/apps/gallery/ajax/cover.php
index 181a919375..068a6e9c4e 100644
--- a/apps/gallery/ajax/cover.php
+++ b/apps/gallery/ajax/cover.php
@@ -70,11 +70,11 @@ $x = min((int)($x/($box_size/$result->numRows())), $result->numRows()-1); // get
$result->seek($x); // never throws
$path = $result->fetchRow();
$path = $path['file_path'];
-$tmp = OC::$CONFIG_DATADIRECTORY . $path;
-$imagesize = getimagesize($tmp);
+$imagePath = OC_Filesystem::getLocalFile($img);
+$imagesize = getimagesize($imagePath);
header('Content-Type: image/png');
-$image = CroppedThumbnail($tmp, $box_size, $box_size);
+$image = CroppedThumbnail($imagePath, $box_size, $box_size);
imagepng($image);
imagedestroy($image);
diff --git a/apps/gallery/lib/scanner.php b/apps/gallery/lib/scanner.php
index 447174e84c..dfb9edebfe 100644
--- a/apps/gallery/lib/scanner.php
+++ b/apps/gallery/lib/scanner.php
@@ -82,7 +82,8 @@ class OC_Gallery_Scanner {
$file_count = min(count($files), 10);
$thumbnail = imagecreatetruecolor($file_count*200, 200);
for ($i = 0; $i < $file_count; $i++) {
- CroppedThumbnail(OC_Config::getValue("datadirectory").'/'. OC_User::getUser() .'/files/'.$files[$i], 200, 200, $thumbnail, $i*200);
+ $imagePath = OC_Filesystem::getLocalFile($files[$i]);
+ CroppedThumbnail($imagePath, 200, 200, $thumbnail, $i*200);
}
imagepng($thumbnail, OC_Config::getValue("datadirectory").'/'. OC_User::getUser() .'/gallery/' . $albumName.'.png');
}
--
GitLab