merge r25124 to release-1.12

git-svn-id: http://framework.zend.com/svn/framework/standard/branches/release-1.12@25125 44c647ce-9c0f-0410-b52a-842ac1e357ba

library/Zend/Navigation/Page.php

@@ -258,10 +258,10 @@ abstract class Zend_Navigation_Page extends Zend_Navigation_Container
                   isset($options['module']) || isset($options['route']) ||
                   isset($options['params']);
 
-        if ($hasMvc && !$hasUri) {
+        if ($hasMvc) {
             require_once 'Zend/Navigation/Page/Mvc.php';
             return new Zend_Navigation_Page_Mvc($options);
-        } elseif ($hasUri && !$hasMvc) {
+        } elseif ($hasUri) {
             require_once 'Zend/Navigation/Page/Uri.php';
             return new Zend_Navigation_Page_Uri($options);
         } else {