Fix for ZF-7374 . Also added Navigation resource plugin test to zend_app_resource testsuite

git-svn-id: http://framework.zend.com/svn/framework/standard/trunk@17015 44c647ce-9c0f-0410-b52a-842ac1e357ba

library/Zend/Application/Resource/Navigation.php

@@ -82,10 +82,16 @@ class Zend_Application_Resource_Navigation
     protected function _storeRegistry()
     {
         $options = $this->getOptions();
-        $key = !is_numeric($options['storage']['registry']['key'])
-             ?  $options['storage']['registry']['key']
-             : self::DEFAULT_REGISTRY_KEY;
-        Zend_Registry::set($key,$this->getContainer());
+        if(isset($options['storage']) &&
+           isset($options['storage']['registry']) &&
+           isset($options['storage']['registry']['key']))
+        {
+           $key = $options['storage']['registry']['key'];
+        } else {
+		    $key = self::DEFAULT_REGISTRY_KEY;
+        }
+        
+		Zend_Registry::set($key,$this->getContainer());
     }
 
     /**

tests/Zend/Application/Resource/AllTests.php

@@ -35,6 +35,7 @@ require_once 'Zend/Application/Resource/FrontcontrollerTest.php';
 require_once 'Zend/Application/Resource/LayoutTest.php';
 require_once 'Zend/Application/Resource/LocaleTest.php';
 require_once 'Zend/Application/Resource/ModulesTest.php';
+require_once 'Zend/Application/Resource/NavigationTest.php';
 require_once 'Zend/Application/Resource/ViewTest.php';
 
 /**
@@ -61,6 +62,7 @@ class Zend_Application_Resource_AllTests
         $suite->addTestSuite('Zend_Application_Resource_LayoutTest');
         $suite->addTestSuite('Zend_Application_Resource_LocaleTest');
         $suite->addTestSuite('Zend_Application_Resource_ModulesTest');
+        $suite->addTestSuite('Zend_Application_Resource_NavigationTest');
         $suite->addTestSuite('Zend_Application_Resource_ViewTest');
 
         return $suite;