diff -r 5e7a0fedabdf -r 877f952ae2bd web/lib/Zend/View/Helper/HeadTitle.php --- a/web/lib/Zend/View/Helper/HeadTitle.php Thu Mar 21 17:31:31 2013 +0100 +++ b/web/lib/Zend/View/Helper/HeadTitle.php Thu Mar 21 19:50:53 2013 +0100 @@ -15,8 +15,8 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) - * @version $Id: HeadTitle.php 23388 2010-11-19 00:37:55Z ramon $ + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: HeadTitle.php 24593 2012-01-05 20:35:02Z matthew $ * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -29,7 +29,7 @@ * @uses Zend_View_Helper_Placeholder_Container_Standalone * @package Zend_View * @subpackage Helper - * @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 */ class Zend_View_Helper_HeadTitle extends Zend_View_Helper_Placeholder_Container_Standalone @@ -69,10 +69,10 @@ */ public function headTitle($title = null, $setType = null) { - if ($setType === null && $this->getDefaultAttachOrder() === null) { - $setType = Zend_View_Helper_Placeholder_Container_Abstract::APPEND; - } elseif ($setType === null && $this->getDefaultAttachOrder() !== null) { - $setType = $this->getDefaultAttachOrder(); + if (null === $setType) { + $setType = (null === $this->getDefaultAttachOrder()) + ? Zend_View_Helper_Placeholder_Container_Abstract::APPEND + : $this->getDefaultAttachOrder(); } $title = (string) $title; if ($title !== '') {