[Fmsystem-commits] [14619] api: fix menu callback

[Sigurd Nes]

Revision: 14619
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=14619
Author:   sigurdne
Date:     2016-01-04 14:13:00 +0000 (Mon, 04 Jan 2016)
Log Message:
-----------
api: fix menu callback

Modified Paths:
--------------
    branches/dev-syncromind/phpgwapi/inc/class.menu.inc.php

Modified: branches/dev-syncromind/phpgwapi/inc/class.menu.inc.php
===================================================================
--- branches/dev-syncromind/phpgwapi/inc/class.menu.inc.php     2016-01-04 
12:56:57 UTC (rev 14618)
+++ branches/dev-syncromind/phpgwapi/inc/class.menu.inc.php     2016-01-04 
14:13:00 UTC (rev 14619)
@@ -411,6 +411,15 @@
                        }
                        $menu = array();
 
+                       $parent_node = array();
+                       if(isset($selection[1]))
+                       {
+                               for ($i=1;$i<count($selection);$i++)
+                               {
+                                       $parent_node[] =  $selection[$i];
+                               }
+                       }
+
                        $_section = 'navigation';
                        if($app == 'admin')
                        {
@@ -491,13 +500,11 @@
                                $vals['url'] = str_replace('&amp;','&', 
$vals['url']);
                                $menu[$i] = $vals;
                                $menu[$i]['app'] = $app;
-                               $menu[$i]['key'] = $key;
+                               $menu[$i]['key'] = implode('|', 
array_merge($parent_node,array($key)));
                                if(isset($menu[$i]['children']))
                                {
                                        $menu[$i]['is_leaf'] = false;
                                        $menu[$i]['children'] = true;
-
-//                                     unset($menu[$i]['children']);
                                }
                                else
                                {