Merge branch 'master' into next

diff --cc wcfsetup/install/files/lib/data/style/StyleAction.class.php
Simple merge

diff --cc wcfsetup/install/files/lib/data/style/StyleEditor.class.php
index e6b18c6745d69426644b78dd9928af2861fc4b17,4d9bd8e1420ceb7cd8e9a27a8a53bfc2079649a3..55fe062f6f69cdaaa779543e65398ae25c02bd9c
--- 1/wcfsetup/install/files/lib/data/style/StyleEditor.class.php
--- 2/wcfsetup/install/files/lib/data/style/StyleEditor.class.php
+++ b/wcfsetup/install/files/lib/data/style/StyleEditor.class.php
@@@ -476,34 -451,36 +476,33 @@@ 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 IMAGETYPE_PNG:
 -                                                              case IMAGETYPE_JPEG:
 -                                                              case IMAGETYPE_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)) {
 +                                              try {
 +                                                      if (($imageData = getimagesize($filename)) !== false) {
 +                                                              switch ($imageData[2]) {
 +                                                                      case IMAGETYPE_PNG:
 +                                                                      case IMAGETYPE_JPEG:
-                                                                       case IMAGETYPE_JPG:
 +                                                                      case IMAGETYPE_GIF:
 +                                                                              $style->update(['image' => 'stylePreview-'.$style->styleID.$fileExtension]);
 +                                                              }
                                                        }
                                                }
 -                                      }
 -                                      catch (SystemException $e) {
 -                                              // broken image
 +                                              catch (SystemException $e) {
 +                                                      // broken image
 +                                              }
                                        }
                                }
                        }