diff -r 5e7a0fedabdf -r 877f952ae2bd web/lib/Zend/Log/Writer/Mail.php --- a/web/lib/Zend/Log/Writer/Mail.php Thu Mar 21 17:31:31 2013 +0100 +++ b/web/lib/Zend/Log/Writer/Mail.php Thu Mar 21 19:50:53 2013 +0100 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Log * @subpackage Writer - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Mail.php 22971 2010-09-18 20:32:24Z mikaelkael $ + * @version $Id: Mail.php 24593 2012-01-05 20:35:02Z matthew $ */ /** Zend_Log_Writer_Abstract */ @@ -39,9 +39,9 @@ * @category Zend * @package Zend_Log * @subpackage Writer - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Mail.php 22971 2010-09-18 20:32:24Z mikaelkael $ + * @version $Id: Mail.php 24593 2012-01-05 20:35:02Z matthew $ */ class Zend_Log_Writer_Mail extends Zend_Log_Writer_Abstract { @@ -106,7 +106,7 @@ * @var array */ protected static $_methodMapHeaders = array( - 'from' => 'setFrom', + 'from' => 'setFrom', 'to' => 'addTo', 'cc' => 'addCc', 'bcc' => 'addBcc', @@ -148,7 +148,7 @@ $writer->setLayout($config); } if (isset($config['layoutFormatter'])) { - $layoutFormatter = new $config['layoutFormatter']; + $layoutFormatter = new $config['layoutFormatter']; $writer->setLayoutFormatter($layoutFormatter); } if (isset($config['subjectPrependText'])) { @@ -185,6 +185,7 @@ * * @param array $config * @return Zend_Mail + * @throws Zend_Log_Exception */ protected static function _constructMailFromConfig(array $config) { @@ -213,8 +214,8 @@ && !is_numeric($address['name']) ) { $params = array( - $address['email'], - $address['name'] + $address['email'], + $address['name'] ); } else if (is_array($address) && isset($address['email'])) { $params = array($address['email']); @@ -233,6 +234,7 @@ * * @param array $config * @return Zend_Layout + * @throws Zend_Log_Exception */ protected function _constructLayoutFromConfig(array $config) { @@ -331,6 +333,7 @@ * * @param string $subject Subject prepend text. * @return Zend_Log_Writer_Mail + * @throws Zend_Log_Exception */ public function setSubjectPrependText($subject) {