diff --git a/controllers/admin/AdminLoginController.php b/controllers/admin/AdminLoginController.php index f56f033d0..1a84c7fec 100755 --- a/controllers/admin/AdminLoginController.php +++ b/controllers/admin/AdminLoginController.php @@ -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)) die(Tools::jsonEncode(array('hasErrors' => false, 'confirm' => $this->l('Your password has been e-mailed to you')))); 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.'))))); } } diff --git a/tools/swift/Swift/Plugin/MailSend.php b/tools/swift/Swift/Plugin/MailSend.php index 7f89b56ec..25686c13e 100644 --- a/tools/swift/Swift/Plugin/MailSend.php +++ b/tools/swift/Swift/Plugin/MailSend.php @@ -7,7 +7,7 @@ * @package Swift_Connection * @license GNU Lesser General Public License */ -ini_set('display_errors','1'); +//ini_set('display_errors','1'); require_once dirname(__FILE__) . "/../ClassLoader.php"; Swift_ClassLoader::load("Swift_Events_SendListener"); Swift_ClassLoader::load("Swift_Events_BeforeSendListener");