[Fmsystem-commits] [14427]

[Nelson Guerra]

Revision: 14427
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=14427
Author:   nelson224
Date:     2015-11-19 23:07:42 +0000 (Thu, 19 Nov 2015)
Log Message:
-----------


Modified Paths:
--------------
    branches/dev-syncromind/frontend/inc/class.uicommon.inc.php

Modified: branches/dev-syncromind/frontend/inc/class.uicommon.inc.php
===================================================================
--- branches/dev-syncromind/frontend/inc/class.uicommon.inc.php 2015-11-19 
23:07:28 UTC (rev 14426)
+++ branches/dev-syncromind/frontend/inc/class.uicommon.inc.php 2015-11-19 
23:07:42 UTC (rev 14427)
@@ -66,6 +66,7 @@
 
                        /* Get the tabs and check to see whether the user has 
specified a tab or has a selected tab on session */
                        $tabs                   = $this->get_tabs();
+                       //print_r($tabs); die;
                        $location_id    = phpgw::get_var('location_id', 'int', 
'REQUEST');                      
                        $tab                    = isset($location_id) ? 
$location_id : phpgwapi_cache::session_get('frontend','tab');
                        $selected               = isset($tab) && $tab ? $tab : 
array_shift(array_keys($tabs));  
@@ -340,11 +341,11 @@
 
                        if(isset($extra_tabs))
                        {
-                               $tabs = array_merge($extra_tabs,$tabs);
+                               $tabs = $extra_tabs + $tabs;
                        }
 
                        phpgwapi_cache::session_clear('frontend', 'extra_tabs');
-
+                       
                        return $tabs;
                }