[Fmsystem-commits] [14658] more on ajax menu

[Sigurd Nes]

Revision: 14658
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=14658
Author:   sigurdne
Date:     2016-01-18 08:24:57 +0000 (Mon, 18 Jan 2016)
Log Message:
-----------
more on ajax menu

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-18 
08:24:27 UTC (rev 14657)
+++ branches/dev-syncromind/phpgwapi/inc/class.menu.inc.php     2016-01-18 
08:24:57 UTC (rev 14658)
@@ -425,28 +425,23 @@
                        {
                                if(!isset($selection[1]))
                                {
-
-                                       $navbar         = $this->get('navbar');
                                        $navigation = $this->get('admin');
 
                                        foreach ( 
$GLOBALS['phpgw_info']['user']['apps'] as $_app => $app_info )
                                        {
-                                               if(!in_array($_app, 
array('logout', 'about', 'preferences')) && isset($navbar[$_app]))
+                                               if(!in_array($_app, 
array('logout', 'about', 'preferences')) && isset($navigation[$_app]))
                                                {
-                                                       
if(isset($navigation[$_app]))
-                                                       {
-                                                               $menu[] = array
-                                                               (
-                                                                       'app'   
        => 'admin',
-                                                                       'key'   
        => $_app,
-                                                                       
'is_leaf'       => count($navigation[$_app]) > 1 ? false : true,
-                                                                       
'children'      => count($navigation[$_app]) > 1 ? true : false,
-                                                                       'text'  
        => $GLOBALS['phpgw']->translation->translate($_app, array(), true),
-                                                                       'url'   
        => $GLOBALS['phpgw']->link('/index.php',
-                                                                               
                        array('menuaction' => 'admin.uiconfig.index', 'appname' 
=> $_app))
+                                                       $menu[] = array
+                                                       (
+                                                               'app'           
=> 'admin',
+                                                               'key'           
=> $_app,
+                                                               'is_leaf'       
=> count($navigation[$_app]) > 1 ? false : true,
+                                                               'children'      
=> count($navigation[$_app]) > 1 ? true : false,
+                                                               'text'          
=> $GLOBALS['phpgw']->translation->translate($_app, array(), true),
+                                                               'url'           
=> str_replace('&','&', $GLOBALS['phpgw']->link('/index.php',
+                                                                               
                array('menuaction' => 'admin.uiconfig.index', 'appname' => 
$_app)))
 
-                                                               );
-                                                       }
+                                                       );
                                                }
                                        }