TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix error while rebasing

Browse Source 
modifié:         core/lib/Thelia/Controller/Admin/ImportExportController.php
This commit is contained in:
Benjamin Perche
2014-07-16 11:50:16 +02:00
parent d8cb1e173b
commit e94f8e9591
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/lib/Thelia/Controller/Admin/ImportExportController.php
View File

@@ -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