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

// BO login bug fix

Browse Source
This commit is contained in:
dMetzger
2011-11-23 22:04:01 +00:00
parent 96694526ca
commit aeeb8e1a39
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/admin/AdminLoginController.php
+1 -1
View File
@@ -196,7 +196,7 @@ class AdminLoginController extends AdminController
if (Mail::Send((int)Configuration::get('PS_LANG_DEFAULT'), 'password', Mail::l('Your new admin password'), $params, $employee->email, $employee->firstname.' '.$employee->lastname)) if (Mail::Send((int)Configuration::get('PS_LANG_DEFAULT'), 'password', Mail::l('Your new admin password'), $params, $employee->email, $employee->firstname.' '.$employee->lastname))
die(Tools::jsonEncode(array('hasErrors' => false, 'confirm' => $this->l('Your password has been e-mailed to you')))); die(Tools::jsonEncode(array('hasErrors' => false, 'confirm' => $this->l('Your password has been e-mailed to you'))));
else else
die(Tools::jsonEncode(array('hasErrors' => true, 'errors' => Tools::displayError('An error occurred during your password change.')))); die(Tools::jsonEncode(array('hasErrors' => true, 'errors' => array(Tools::displayError('An error occurred during your password change.')))));
} }
} }
tools/swift/Swift/Plugin/MailSend.php
+1 -1
View File
@@ -7,7 +7,7 @@
* @package Swift_Connection * @package Swift_Connection
* @license GNU Lesser General Public License * @license GNU Lesser General Public License
*/ */
ini_set('display_errors','1'); //ini_set('display_errors','1');
require_once dirname(__FILE__) . "/../ClassLoader.php"; require_once dirname(__FILE__) . "/../ClassLoader.php";
Swift_ClassLoader::load("Swift_Events_SendListener"); Swift_ClassLoader::load("Swift_Events_SendListener");
Swift_ClassLoader::load("Swift_Events_BeforeSendListener"); Swift_ClassLoader::load("Swift_Events_BeforeSendListener");