Fixed import issues

diff --git a/wcfsetup/install/files/lib/system/importer/AbstractAttachmentImporter.class.php b/wcfsetup/install/files/lib/system/importer/AbstractAttachmentImporter.class.php
index fbf65f922d4f495029f20e4629d2d1021407d45b..96b10745d77436eedc276913cec5c93c1b6c9be4 100644 (file)
--- a/wcfsetup/install/files/lib/system/importer/AbstractAttachmentImporter.class.php
+++ b/wcfsetup/install/files/lib/system/importer/AbstractAttachmentImporter.class.php
@@ -60,8 +60,11 @@ class AbstractAttachmentImporter implements IImporter {
                        // create thumbnails
                        if (ATTACHMENT_ENABLE_THUMBNAILS) {
                                if ($attachment->isImage) {
-                                       $action = new AttachmentAction(array($attachment), 'generateThumbnails');
-                                       $action->executeAction();
+                                       try {
+                                               $action = new AttachmentAction(array($attachment), 'generateThumbnails');
+                                               $action->executeAction();
+                                       }
+                                       catch (SystemException $e) {}   
                                }
                        }
                        

diff --git a/wcfsetup/install/files/lib/system/importer/AbstractCommentResponseImporter.class.php b/wcfsetup/install/files/lib/system/importer/AbstractCommentResponseImporter.class.php
index 54f64209368bf60a03062569b93cca666e44908c..e86bcb3ff7bcab4e6b77bd356c522efa417c01de 100644 (file)
--- a/wcfsetup/install/files/lib/system/importer/AbstractCommentResponseImporter.class.php
+++ b/wcfsetup/install/files/lib/system/importer/AbstractCommentResponseImporter.class.php
@@ -29,7 +29,7 @@ class AbstractCommentResponseImporter implements IImporter {
                if (!$data['commentID']) return 0;
                
                $action = new CommentResponseAction(array(), 'create', array(
-                       'data' => array_merge($data, array('objectTypeID' => $this->objectTypeID))              
+                       'data' => $data         
                ));
                $returnValues = $action->executeAction();
                $newID = $returnValues['returnValues']->responseID;