diff -r 5a6b6e770365 -r 68c69c656a2c web/lib/Zend/Application/Resource/Translate.php --- a/web/lib/Zend/Application/Resource/Translate.php Thu May 07 15:10:09 2015 +0200 +++ b/web/lib/Zend/Application/Resource/Translate.php Thu May 07 15:16:02 2015 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Application * @subpackage Resource - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Translate.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** @@ -33,7 +33,7 @@ * @category Zend * @package Zend_Application * @subpackage Resource - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Application_Resource_Translate extends Zend_Application_Resource_ResourceAbstract @@ -86,8 +86,14 @@ unset($options['data']); } + if (isset($options['log'])) { + if (is_array($options['log'])) { + $options['log'] = Zend_Log::factory($options['log']); + } + } + if (isset($options['options'])) { - foreach($options['options'] as $key => $value) { + foreach ($options['options'] as $key => $value) { $options[$key] = $value; } } @@ -112,13 +118,15 @@ : self::DEFAULT_REGISTRY_KEY; unset($options['registry_key']); - if(Zend_Registry::isRegistered($key)) { + if (Zend_Registry::isRegistered($key)) { $translate = Zend_Registry::get($key); - if(!$translate instanceof Zend_Translate) { + if (!$translate instanceof Zend_Translate) { require_once 'Zend/Application/Resource/Exception.php'; - throw new Zend_Application_Resource_Exception($key - . ' already registered in registry but is ' - . 'no instance of Zend_Translate'); + throw new Zend_Application_Resource_Exception( + $key + . ' already registered in registry but is ' + . 'no instance of Zend_Translate' + ); } $translate->addTranslation($options);