[-] FO : Notice if blocknewsletter has been removed
This commit is contained in:
1 parent
0d2a5a46bd
commit
7b392d6233
1 file changed
+12
-8
@@ -74,7 +74,11 @@ class AuthControllerCore extends FrontController
|
|||||||
|
|
||||||
$this->assignCountries();
|
$this->assignCountries();
|
||||||
|
|
||||||
$this->context->smarty->assign('newsletter', (int)Module::getInstanceByName('blocknewsletter')->active);
|
$active_module_newsletter = false;
|
||||||
|
if ($module_newsletter = Module::getInstanceByName('blocknewsletter'))
|
||||||
|
$active_module_newsletter = $module_newsletter->active;
|
||||||
|
|
||||||
|
$this->context->smarty->assign('newsletter', (int)$active_module_newsletter);
|
||||||
|
|
||||||
$back = Tools::getValue('back');
|
$back = Tools::getValue('back');
|
||||||
$key = Tools::safeOutput(Tools::getValue('key'));
|
$key = Tools::safeOutput(Tools::getValue('key'));
|
||||||
@@ -561,15 +565,15 @@ class AuthControllerCore extends FrontController
|
|||||||
protected function sendConfirmationMail(Customer $customer)
|
protected function sendConfirmationMail(Customer $customer)
|
||||||
{
|
{
|
||||||
return Mail::Send(
|
return Mail::Send(
|
||||||
$this->context->language->id,
|
$this->context->language->id,
|
||||||
'account',
|
'account',
|
||||||
Mail::l('Welcome!'),
|
Mail::l('Welcome!'),
|
||||||
array(
|
array(
|
||||||
'{firstname}' => $customer->firstname,
|
'{firstname}' => $customer->firstname,
|
||||||
'{lastname}' => $customer->lastname,
|
'{lastname}' => $customer->lastname,
|
||||||
'{email}' => $customer->email,
|
'{email}' => $customer->email,
|
||||||
'{passwd}' => Tools::getValue('passwd')),
|
'{passwd}' => Tools::getValue('passwd')),
|
||||||
$customer->email,
|
$customer->email,
|
||||||
$customer->firstname.' '.$customer->lastname
|
$customer->firstname.' '.$customer->lastname
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in new issue
Block a user