From: kondou <kondou@ts.unde.re>
Date: Sat, 31 Aug 2013 21:48:23 +0000 (+0200)
Subject: Merge branch 'master' into fix_4258
X-Git-Tag: v6.0.0alpha2~233^2~1
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=235638e5abd35f2f19944bbe0b5a838b83465252;p=nextcloud-server.git

Merge branch 'master' into fix_4258

Conflicts:
	lib/image.php
---

235638e5abd35f2f19944bbe0b5a838b83465252
diff --cc lib/image.php
index fcb13a1fa14,840b744ad72..badc30ab9a0
--- a/lib/image.php
+++ b/lib/image.php
@@@ -519,9 -496,11 +519,14 @@@ class OC_Image 
  			return false;
  		}
  		$this->resource = @imagecreatefromstring($str);
 +		if (\OC_Util::fileInfoLoaded()) {
 +			$this->mimeType = $this->fileInfo->buffer($str);
 +		}
+ 		if(is_resource($this->resource)) {
+ 			imagealphablending($this->resource, false);
+ 			imagesavealpha($this->resource, true);
+ 		}
+ 
  		if(!$this->resource) {
  			OC_Log::write('core', 'OC_Image->loadFromData, couldn\'t load', OC_Log::DEBUG);
  			return false;