diff --git a/core/lib/Thelia/Controller/Admin/ImportController.php b/core/lib/Thelia/Controller/Admin/ImportController.php index 81fe1aa02..1e8058172 100644 --- a/core/lib/Thelia/Controller/Admin/ImportController.php +++ b/core/lib/Thelia/Controller/Admin/ImportController.php @@ -443,7 +443,6 @@ class ImportController extends BaseAdminController $event = new UpdatePositionEvent($id, $this->getMode($mode), $value); $this->dispatch(TheliaEvents::IMPORT_CHANGE_POSITION, $event); - return $this->render('import'); } diff --git a/core/lib/Thelia/Core/DependencyInjection/Loader/XmlFileLoader.php b/core/lib/Thelia/Core/DependencyInjection/Loader/XmlFileLoader.php index 1d1fec0fd..e63cc4183 100644 --- a/core/lib/Thelia/Core/DependencyInjection/Loader/XmlFileLoader.php +++ b/core/lib/Thelia/Core/DependencyInjection/Loader/XmlFileLoader.php @@ -25,6 +25,7 @@ use Symfony\Component\DependencyInjection\SimpleXMLElement; use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException; use Symfony\Component\DependencyInjection\Exception\RuntimeException; use Symfony\Component\DependencyInjection\Loader\FileLoader; +use Thelia\Log\Tlog; use Thelia\Model\Export; use Thelia\Model\ExportCategory; use Thelia\Model\ExportCategoryQuery; @@ -369,7 +370,7 @@ class XmlFileLoader extends FileLoader } catch (\Exception $e) { $con->rollBack(); - throw $e; + Tlog::getInstance()->error($e->getMessage()); } } @@ -450,7 +451,7 @@ class XmlFileLoader extends FileLoader } catch (\Exception $e) { $con->rollBack(); - throw $e; + Tlog::getInstance()->error($e->getMessage()); } } @@ -497,7 +498,7 @@ class XmlFileLoader extends FileLoader } catch (\Exception $e) { $con->rollBack(); - throw $e; + Tlog::getInstance()->error($e->getMessage()); } } @@ -577,7 +578,7 @@ class XmlFileLoader extends FileLoader } catch (\Exception $e) { $con->rollBack(); - throw $e; + Tlog::getInstance()->error($e->getMessage()); } } diff --git a/core/lib/Thelia/Form/CustomerUpdateForm.php b/core/lib/Thelia/Form/CustomerUpdateForm.php index 21e653cff..383e0a335 100755 --- a/core/lib/Thelia/Form/CustomerUpdateForm.php +++ b/core/lib/Thelia/Form/CustomerUpdateForm.php @@ -169,7 +169,7 @@ class CustomerUpdateForm extends BaseForm 'label_attr' => array( 'for' => 'reseller' ) - )) + )) ; } diff --git a/core/lib/Thelia/Model/Export.php b/core/lib/Thelia/Model/Export.php index c9c21bdc0..b5483ae3a 100644 --- a/core/lib/Thelia/Model/Export.php +++ b/core/lib/Thelia/Model/Export.php @@ -92,7 +92,6 @@ class Export extends BaseExport return true; } - public function addCriteriaToPositionQuery($query) { $query->filterByExportCategoryId($this->getExportCategoryId());