[Pkg-owncloud-commits] [owncloud] 04/85: fix issue with spamming logging files when loading cached thumbnail

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch 6.0
in repository owncloud.

commit 1d2dc9b685b547a8683567726d5505df20fb319f
Author: Georg Ehrke <developer at georgehrke.com>
Date:   Wed Mar 5 13:20:50 2014 +0100

    fix issue with spamming logging files when loading cached thumbnail
    
    Conflicts:
    	lib/private/preview.php
---
 lib/private/preview.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/lib/private/preview.php b/lib/private/preview.php
index ff93f43..9088d66 100755
--- a/lib/private/preview.php
+++ b/lib/private/preview.php
@@ -391,10 +391,13 @@ class Preview {
 
 		$cached = $this->isCached();
 
-		if($cached) {
-			$image = new \OC_Image($this->userView->file_get_contents($cached, 'r'));
+		if ($cached) {
+			$stream = $this->userView->fopen($cached, 'r');
+			$image = new \OC_Image();
+			$image->loadFromFileHandle($stream);
 			$this->preview = $image->valid() ? $image : null;
 			$this->resizeAndCrop();
+			fclose($stream);
 		}
 
 		if(is_null($this->preview)) {

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git