From f76429573dbd164c3ef94efaefeae02f9235c2a0 Mon Sep 17 00:00:00 2001 From: Marcel Werk Date: Thu, 4 Jul 2013 02:25:33 +0200 Subject: [PATCH] Fixed import issues --- .../system/importer/AbstractAttachmentImporter.class.php | 7 +++++-- .../importer/AbstractCommentResponseImporter.class.php | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) 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; -- 2.20.1