Merge branch 'master' of https://github.com/thelia/thelia into coupon
# By Manuel Raynaud (9) and Etienne Roudeix (1) # Via Manuel Raynaud * 'master' of https://github.com/thelia/thelia: update customer loop in template customer strat regiter page complete login form change link for homepage start creating register and login pages display good currency in template defin currency at runtime creating index page fix tests start integration default template
This commit is contained in:
@@ -179,7 +179,14 @@ class BaseController extends ContainerAware
|
||||
return $form;
|
||||
}
|
||||
else {
|
||||
throw new FormValidationException(sprintf("Missing or invalid data: %s", $this->getErrorMessages($form)));
|
||||
$errorMessage = null;
|
||||
if ($form->get("error_message")->getData() != null) {
|
||||
$errorMessage = $form->get("error_message")->getData();
|
||||
} else {
|
||||
$errorMessage = sprintf("Missing or invalid data: %s", $this->getErrorMessages($form));
|
||||
}
|
||||
|
||||
throw new FormValidationException($errorMessage);
|
||||
}
|
||||
}
|
||||
else {
|
||||
|
||||
Reference in New Issue
Block a user