dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[-] FO : Notice if blocknewsletter has been removed

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9229 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
fBrignoli
2011-10-11 12:59:30 +00:00
parent 14bf4ba719
commit 329a0966ca
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/front/AuthController.php
+12 -8
View File
@@ -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
); );
} }