From: Tim Düsterhus <duesterhus@woltlab.com>
Date: Fri, 6 May 2016 13:07:21 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: 3.0.0_Beta_1~1758
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=1e54e2292df532ab5aae8cdedb5231159f7d227f;p=GitHub%2FWoltLab%2FWCF.git

Merge branch 'master' into next
---

1e54e2292df532ab5aae8cdedb5231159f7d227f
diff --cc wcfsetup/install/files/lib/data/style/StyleEditor.class.php
index 9d81404fff,7c6ba1a6a0..6c0a623745
--- a/wcfsetup/install/files/lib/data/style/StyleEditor.class.php
+++ b/wcfsetup/install/files/lib/data/style/StyleEditor.class.php
@@@ -471,21 -451,37 +471,34 @@@ class StyleEditor extends DatabaseObjec
  		}
  		
  		// save style
 -		if ($style !== null) {
 -			$style->update($styleData);
 -		}
 -		else {
 +		if ($style === null) {
  			$styleData['packageID'] = $packageID;
  			$style = new StyleEditor(self::create($styleData));
 -		}
 -		
 -		// import preview image
 -		if (!empty($data['image'])) {
 -			$fileExtension = mb_substr($data['image'], mb_strrpos($data['image'], '.'));
 -			$index = $tar->getIndexByFilename($data['image']);
 -			if ($index !== false) {
 -				$filename = WCF_DIR.'images/stylePreview-'.$style->styleID.$fileExtension;
 -				$tar->extract($index, $filename);
 -				FileUtil::makeWritable($filename);
 -				
 -				if (file_exists($filename)) {
 -					try {
 -						if (($imageData = getimagesize($filename)) !== false) {
 -							switch ($imageData[2]) {
 -								case IMG_PNG:
 -								case IMG_JPEG:
 -								case IMG_JPG:
 -								case IMG_GIF:
 -									$style->update(array('image' => 'stylePreview-'.$style->styleID.$fileExtension));
 +			
 +			// import preview image
 +			if (!empty($data['image'])) {
 +				$fileExtension = mb_substr($data['image'], mb_strrpos($data['image'], '.'));
 +				$index = $tar->getIndexByFilename($data['image']);
 +				if ($index !== false) {
 +					$filename = WCF_DIR.'images/stylePreview-'.$style->styleID.$fileExtension;
 +					$tar->extract($index, $filename);
 +					FileUtil::makeWritable($filename);
 +			
 +					if (file_exists($filename)) {
- 						$style->update(['image' => 'stylePreview-'.$style->styleID.$fileExtension]);
++						try {
++							if (($imageData = getimagesize($filename)) !== false) {
++								switch ($imageData[2]) {
++									case IMG_PNG:
++									case IMG_JPEG:
++									case IMG_JPG:
++									case IMG_GIF:
++										$style->update(['image' => 'stylePreview-'.$style->styleID.$fileExtension]);
++								}
+ 							}
+ 						}
 -					}
 -					catch (SystemException $e) {
 -						// broken image
++						catch (SystemException $e) {
++							// broken image
++						}
  					}
  				}
  			}