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

Merge branch 'master' into actions

Browse Source
This commit is contained in:
Manuel Raynaud
2013-09-03 09:36:54 +02:00
parent 3f078b8c81 dce816d77c
commit 13ffbddc1b
176 changed files with 3967 additions and 2037 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/lib/Thelia/Controller/Front/CustomerController.php
View File

@@ -71,10 +71,10 @@ class CustomerController extends BaseFrontController
$this->redirectSuccess($customerCreation);
}
catch (FormValidationException $e) {
$message = "Invalid or missing data. Please check your input";
$message = sprintf("Please check your input: %s", $ex->getMessage());
}
catch (\Exception $e) {
$message = "Sorry, an unknown error occured.";
$message = sprintf("Sorry, an error occured: %s", $ex->getMessage());
}
if ($message !== false) {
@@ -119,10 +119,10 @@ class CustomerController extends BaseFrontController
}
catch (FormValidationException $e) {
$message = "Invalid or missing data. Please check your input";
$message = sprintf("Please check your input: %s", $ex->getMessage());
}
catch (\Exception $e) {
$message = "Sorry, an unknown error occured.";
$message = sprintf("Sorry, an error occured: %s", $ex->getMessage());
}
if ($message !== false) {
@@ -167,7 +167,7 @@ class CustomerController extends BaseFrontController
}
catch (FormValidationException $e) {
$message = "Invalid or missing data. Please check your input";
$message = sprintf("Please check your input: %s", $ex->getMessage());
}
catch(UsernameNotFoundException $e) {
$message = "This customer email was not found.";
@@ -179,7 +179,7 @@ class CustomerController extends BaseFrontController
$message = "Sorry, we failed to authentify you. Please try again.";
}
catch (\Exception $e) {
$message = "Sorry, an unknown error occured.";
$message = sprintf("Sorry, an error occured: %s", $ex->getMessage());
}
if ($message !== false) {