--- a/web/lib/Zend/Application/Resource/Navigation.php Thu May 07 15:10:09 2015 +0200
+++ b/web/lib/Zend/Application/Resource/Navigation.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: Navigation.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)
* @author Dolf Schimmel
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -57,10 +57,12 @@
if (!$this->_container) {
$options = $this->getOptions();
- if(isset($options['defaultPageType'])) {
- Zend_Navigation_Page::setDefaultPageType($options['defaultPageType']);
+ if (isset($options['defaultPageType'])) {
+ Zend_Navigation_Page::setDefaultPageType(
+ $options['defaultPageType']
+ );
}
-
+
$pages = isset($options['pages']) ? $options['pages'] : array();
$this->_container = new Zend_Navigation($pages);
}
@@ -93,15 +95,16 @@
protected function _storeRegistry()
{
$options = $this->getOptions();
- if(isset($options['storage']['registry']['key']) &&
- !is_numeric($options['storage']['registry']['key'])) // see ZF-7461
- {
- $key = $options['storage']['registry']['key'];
+ // see ZF-7461
+ if (isset($options['storage']['registry']['key'])
+ && !is_numeric($options['storage']['registry']['key'])
+ ) {
+ $key = $options['storage']['registry']['key'];
} else {
$key = self::DEFAULT_REGISTRY_KEY;
}
- Zend_Registry::set($key,$this->getContainer());
+ Zend_Registry::set($key, $this->getContainer());
}
/**