diff --git a/core/lib/Thelia/Controller/Admin/ImportController.php b/core/lib/Thelia/Controller/Admin/ImportController.php index 2ee8958ae..545ba8b6d 100644 --- a/core/lib/Thelia/Controller/Admin/ImportController.php +++ b/core/lib/Thelia/Controller/Admin/ImportController.php @@ -141,7 +141,7 @@ class ImportController extends BaseAdminController /** * If the file is an archive */ - $archiveBuilder->loadArchive($file->getPathname()); + $archiveBuilder = $archiveBuilder->loadArchive($file->getPathname()); $content = null; /** @@ -193,7 +193,7 @@ class ImportController extends BaseAdminController $this->dispatch(TheliaEvents::IMPORT_AFTER_DECODE, $event); - $data = $formatter->decode($content); + $data = $formatter->decode($event->getContent()); $event->setContent(null)->setData($data); $this->dispatch(TheliaEvents::IMPORT_AFTER_DECODE, $event); diff --git a/core/lib/Thelia/Core/FileFormat/Formatting/Formatter/XMLFormatter.php b/core/lib/Thelia/Core/FileFormat/Formatting/Formatter/XMLFormatter.php index 9351ebe7f..e445e3b32 100644 --- a/core/lib/Thelia/Core/FileFormat/Formatting/Formatter/XMLFormatter.php +++ b/core/lib/Thelia/Core/FileFormat/Formatting/Formatter/XMLFormatter.php @@ -152,7 +152,7 @@ class XMLFormatter extends AbstractFormatter unset($array[$this->nodeName]); } - $data = new FormatterData($this->getAliases()); + $data = new FormatterData(); return $data->setData($array); } diff --git a/core/lib/Thelia/Core/FileFormat/Formatting/FormatterData.php b/core/lib/Thelia/Core/FileFormat/Formatting/FormatterData.php index a4f494775..992713ef3 100644 --- a/core/lib/Thelia/Core/FileFormat/Formatting/FormatterData.php +++ b/core/lib/Thelia/Core/FileFormat/Formatting/FormatterData.php @@ -139,7 +139,7 @@ class FormatterData * @param array $data * @param array $aliases */ - protected function applyAliases(array $data, array $aliases) + public function applyAliases(array $data, array $aliases) { $formattedData = [];