From: Marcel Werk <burntime@woltlab.com>
Date: Thu, 4 Jul 2013 00:25:33 +0000 (+0200)
Subject: Fixed import issues
X-Git-Tag: 2.0.0_Beta_5~105
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=f76429573dbd164c3ef94efaefeae02f9235c2a0;p=GitHub%2FWoltLab%2FWCF.git

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 fbf65f922d..96b10745d7 100644
--- 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 54f6420936..e86bcb3ff7 100644
--- 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;