From 74ec51b06eeab5738a5e0a50d1a162f5aae0eab7 Mon Sep 17 00:00:00 2001
From: Benjamin Perche <bperche9@gmail.com>
Date: Wed, 6 Aug 2014 09:07:37 +0200
Subject: [PATCH 1/2] =?UTF-8?q?Log=20insertion=20error=20instead=20of=20th?=
 =?UTF-8?q?rowing=20them=20=09modifi=C3=A9:=20=20=20=20=20=20=20=20=20core?=
 =?UTF-8?q?/lib/Thelia/Core/DependencyInjection/Loader/XmlFileLoader.php?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Core/DependencyInjection/Loader/XmlFileLoader.php    | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

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());
         }
     }
 

From eae1acba819e22204d0c143e0f1b1bdeef453c12 Mon Sep 17 00:00:00 2001
From: Benjamin Perche <bperche9@gmail.com>
Date: Wed, 6 Aug 2014 09:08:48 +0200
Subject: [PATCH 2/2] =?UTF-8?q?Fix=20cs=20=09modifi=C3=A9:=20=20=20=20=20?=
 =?UTF-8?q?=20=20=20=20core/lib/Thelia/Controller/Admin/ImportController.p?=
 =?UTF-8?q?hp=20=09modifi=C3=A9:=20=20=20=20=20=20=20=20=20core/lib/Thelia?=
 =?UTF-8?q?/Form/CustomerUpdateForm.php=20=09modifi=C3=A9:=20=20=20=20=20?=
 =?UTF-8?q?=20=20=20=20core/lib/Thelia/Model/Export.php?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/lib/Thelia/Controller/Admin/ImportController.php | 1 -
 core/lib/Thelia/Form/CustomerUpdateForm.php           | 2 +-
 core/lib/Thelia/Model/Export.php                      | 1 -
 3 files changed, 1 insertion(+), 3 deletions(-)

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/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());