Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development

This commit is contained in:
vAugagneur
2013-04-26 12:19:25 +02:00
@@ -113,6 +113,8 @@ class InstallControllerConsoleProcess extends InstallControllerConsole
if (!$this->processSendEmail()) if (!$this->processSendEmail())
$this->printErrors(); $this->printErrors();
if ($this->datas->newsletter)
{
$params = http_build_query(array( $params = http_build_query(array(
'email' => $this->datas->admin_email, 'email' => $this->datas->admin_email,
'method' => 'addMemberToNewsletter', 'method' => 'addMemberToNewsletter',
@@ -122,6 +124,7 @@ class InstallControllerConsoleProcess extends InstallControllerConsole
)); ));
Tools::file_get_contents('http://www.prestashop.com/ajax/controller.php?'.$params); Tools::file_get_contents('http://www.prestashop.com/ajax/controller.php?'.$params);
} }
}
/** /**
* PROCESS : generateSettingsFile * PROCESS : generateSettingsFile