[-] FO : Notice if blocknewsletter has been removed

2011-10-11 12:59:30 +00:00
parent 0d2a5a46bd
commit 7b392d6233
1 changed files with 12 additions and 8 deletions
@@ -74,7 +74,11 @@ class AuthControllerCore extends FrontController

 		$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');
 		$key = Tools::safeOutput(Tools::getValue('key'));
@@ -561,15 +565,15 @@ class AuthControllerCore extends FrontController
 	protected function sendConfirmationMail(Customer $customer)
 	{
 		return Mail::Send(
-			$this->context->language->id, 
-			'account', 
+			$this->context->language->id,
+			'account',
 			Mail::l('Welcome!'),
 			array(
-				'{firstname}' => $customer->firstname, 
-				'{lastname}' => $customer->lastname, 
-				'{email}' => $customer->email, 
-				'{passwd}' => Tools::getValue('passwd')), 
-			$customer->email, 
+				'{firstname}' => $customer->firstname,
+				'{lastname}' => $customer->lastname,
+				'{email}' => $customer->email,
+				'{passwd}' => Tools::getValue('passwd')),
+			$customer->email,
 			$customer->firstname.' '.$customer->lastname
 		);
 	}