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

[-] BO : fix #PSCFV-3893

Browse Source
This commit is contained in:
lLefevre
2012-09-04 07:57:59 +00:00
parent 32490e39d1
commit 31d5d71e73
16 changed files with 47 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/admin/AdminLoginController.php
+1 -1
View File
@@ -218,7 +218,7 @@ class AdminLoginControllerCore extends AdminController
'{passwd}' => $pwd
);
if (Mail::Send((int)Configuration::get('PS_LANG_DEFAULT'), 'password', Mail::l('Your new admin password', (int)Configuration::get('PS_LANG_DEFAULT')), $params, $employee->email, $employee->firstname.' '.$employee->lastname))
if (Mail::Send((int)Configuration::get('PS_LANG_DEFAULT'), 'password', Mail::l('Your new password', (int)Configuration::get('PS_LANG_DEFAULT')), $params, $employee->email, $employee->firstname.' '.$employee->lastname))
{
// Update employee only if the mail can be sent
$result = $employee->update();
controllers/front/PasswordController.php
+1 -1
View File
@@ -85,7 +85,7 @@ class PasswordControllerCore extends FrontController
if ($customer->update())
{
Hook::exec('actionPasswordRenew', array('customer' => $customer, 'password' => $password));
if (Mail::Send($this->context->language->id, 'password', Mail::l('Your new admin password'),
if (Mail::Send($this->context->language->id, 'password', Mail::l('Your new password'),
array(
'{email}' => $customer->email,
'{lastname}' => $customer->lastname,