[-] Fix bug #PSCFV-9414 bad check on states when PS_REGISTRATION_PROCESS_TYPE = 0

This commit is contained in:
gRoussac
2013-06-24 13:54:02 +02:00
parent 8702e26c41
commit 21856959a2
+2 -2
View File
@@ -531,12 +531,12 @@ class AuthControllerCore extends FrontController
if (!count($this->errors))
{
// if registration type is in one step, we save the address
if (Configuration::get('PS_REGISTRATION_PROCESS_TYPE') || Tools::isSubmit('submitGuestAccount'))
if (Tools::isSubmit('submitAccount') || Tools::isSubmit('submitGuestAccount'))
if (!($country = new Country($address->id_country, Configuration::get('PS_LANG_DEFAULT'))) || !Validate::isLoadedObject($country))
die(Tools::displayError());
$contains_state = isset($country) && is_object($country) ? (int)$country->contains_states: 0;
$id_state = isset($address) && is_object($address) ? (int)$address->id_state: 0;
if ((Configuration::get('PS_REGISTRATION_PROCESS_TYPE') || Tools::isSubmit('submitGuestAccount')) && $contains_state && !$id_state)
if ((Tools::isSubmit('submitAccount')|| Tools::isSubmit('submitGuestAccount')) && $contains_state && !$id_state)
$this->errors[] = Tools::displayError('This country requires you to choose a State.');
else
{