From e94f8e95914b2aa260c3afc0ffa230740080cf55 Mon Sep 17 00:00:00 2001 From: Benjamin Perche Date: Wed, 16 Jul 2014 11:50:16 +0200 Subject: [PATCH] =?UTF-8?q?Fix=20error=20while=20rebasing=20=09modifi?= =?UTF-8?q?=C3=A9:=20=20=20=20=20=20=20=20=20core/lib/Thelia/Controller/Ad?= =?UTF-8?q?min/ImportExportController.php?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controller/Admin/ImportExportController.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/core/lib/Thelia/Controller/Admin/ImportExportController.php b/core/lib/Thelia/Controller/Admin/ImportExportController.php index 61394415d..8bed0dbab 100644 --- a/core/lib/Thelia/Controller/Admin/ImportExportController.php +++ b/core/lib/Thelia/Controller/Admin/ImportExportController.php @@ -115,16 +115,16 @@ class ImportExportController extends BaseAdminController $boundForm->get("formatter")->getData() ); + /** + * Build an event containing the formatter and the handler. + * Used for specific configuration (e.g: XML node names) + */ + $event = new ExportEvent($formatter, $handler); + $filename = $formatter::FILENAME . "." . $formatter->getExtension(); if (!$boundForm->get("do_compress")->getData()) { - /** - * Build an event containing the formatter and the handler. - * Used for specific configuration (e.g: XML node names) - */ - $event = new ExportEvent($formatter, $handler); - if (!$boundForm->get("do_compress")->getData()) { /** * Dispatch the event