From fc01a13811f5da395f1a9ed1171f15f5fffcb71e Mon Sep 17 00:00:00 2001
From: kondou <kondou@ts.unde.re>
Date: Wed, 12 Feb 2014 22:35:49 +0100
Subject: [PATCH] Fix imagerotate and move loadFromBase64() one up.
imagerotate() with third parameter being -1 does not seem to work in PHP 5.5
loadFromBase64() one up, so debug-logs aren't spammed (as much) with urlencoded
base64-data from loadFromFile() debug output.
---
lib/private/image.php | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/lib/private/image.php b/lib/private/image.php
index 91a9f91e1d..0b99bf23f6 100644
--- a/lib/private/image.php
+++ b/lib/private/image.php
@@ -346,7 +346,7 @@ class OC_Image {
break;
}
if($rotate) {
- $res = imagerotate($this->resource, $rotate, -1);
+ $res = imagerotate($this->resource, $rotate, 0);
if($res) {
if(imagealphablending($res, true)) {
if(imagesavealpha($res, true)) {
@@ -381,10 +381,10 @@ class OC_Image {
} elseif(in_array(get_resource_type($imageRef), array('file', 'stream'))) {
return $this->loadFromFileHandle($imageRef);
}
- } elseif($this->loadFromFile($imageRef) !== false) {
- return $this->resource;
} elseif($this->loadFromBase64($imageRef) !== false) {
return $this->resource;
+ } elseif($this->loadFromFile($imageRef) !== false) {
+ return $this->resource;
} elseif($this->loadFromData($imageRef) !== false) {
return $this->resource;
} else {
@@ -415,7 +415,6 @@ class OC_Image {
public function loadFromFile($imagePath=false) {
// exif_imagetype throws "read error!" if file is less than 12 byte
if(!@is_file($imagePath) || !file_exists($imagePath) || filesize($imagePath) < 12 || !is_readable($imagePath)) {
- // Debug output disabled because this method is tried before loadFromBase64?
OC_Log::write('core', 'OC_Image->loadFromFile, couldn\'t load: ' . (string) urlencode($imagePath), OC_Log::DEBUG);
return false;
}
--
GitLab