Permalink
Browse files

Fixed navigation loading for new abstract navigations.

  • Loading branch information...
1 parent f72ddb9 commit 06749885635ec882cbdf647f52ad634ea4265bdd @balupton balupton committed Dec 9, 2010
Showing with 13 additions and 1 deletion.
  1. +12 −0 lib/Bal/App.php
  2. +1 −1 lib/Bal/Controller/Action/Helper/App.php
View
@@ -624,6 +624,18 @@ static public function getActionControllerView ( ) {
return self::getView();
}
+ static public function parseAdvancedYamlFile ( ) {
+ $args = func_get_args();
+ $Bootstrapr = Bootstrapr::getInstance();
+ return call_user_func_array(array($Bootstrapr,'parseAdvancedYamlFile'), $args);
+ }
+
+ static public function loadAdvancedYamlFile ( ) {
+ $args = func_get_args();
+ $Bootstrapr = Bootstrapr::getInstance();
+ return call_user_func_array(array($Bootstrapr,'loadAdvancedYamlFile'), $args);
+ }
+
/**
* Generates a Zend_Config object from a data file
*/
@@ -59,7 +59,7 @@ public function applyNavigation ( ) {
$NavData = Bal_App::parseDataFile($module_config_path.'/nav',$module_config_path.'/compiled/nav.data');
# Navigation Override
- $NavDataOver = Bal_App::parseDataFile(NAVIGATION_FILE_PATH,NAVIGATION_COMPILED_FILE_PATH);
+ $NavDataOver = Bal_App::parseAdvancedYamlFile(NAVIGATION_FILE_PATH,NAVIGATION_COMPILED_FILE_PATH);
if ( !empty($NavDataOver) ) {
$NavDataOver = delve($NavDataOver,$module);
if ( !empty($NavDataOver) ) {

0 comments on commit 0674988

Please sign in to comment.