[Phpgroupware-cvs] admin/inc/class.uimenuclass.inc.php, 1.10

[nomail]

Update of /admin/inc
Modified Files:
        Branch: 
          class.uimenuclass.inc.php

date: 2004/12/30 07:38:14;  author: skwashd;  state: Exp;  lines: +6 -4

Log Message:
new HEAD admin - sans GIFs
=====================================================================
Index: admin/inc/class.uimenuclass.inc.php
diff -u admin/inc/class.uimenuclass.inc.php:1.9 
admin/inc/class.uimenuclass.inc.php:1.10
--- admin/inc/class.uimenuclass.inc.php:1.9     Fri Jan 11 02:01:29 2002
+++ admin/inc/class.uimenuclass.inc.php Thu Dec 30 07:38:14 2004
@@ -45,15 +45,18 @@
                {
                        $i=0;
 
+                       // reset the value of all_rows
+                       $this->t->set_var('all_rows','');
+
                        while(list($key,$value) = each($_menuData))
                        {
                                if (!empty($value['extradata']))
                                {
-                                       $link = 
$GLOBALS['phpgw']->link($value['url'],'account_id=' . $GLOBALS['account_id'] . 
'&' . $value['extradata']);
+                                       $link = 
$GLOBALS['phpgw']->link($value['url'],'account_id=' . 
get_var('account_id',array('GET','POST')) . '&' . $value['extradata']);
                                }
                                else
                                {
-                                       $link = 
$GLOBALS['phpgw']->link($value['url'],'account_id=' . $GLOBALS['account_id']);
+                                       $link = 
$GLOBALS['phpgw']->link($value['url'],'account_id=' . 
get_var('account_id',array('GET','POST')));
                                }
                                
$this->section_item($link,lang($value['description']),$this->rowColor[($i % 
2)]);
                                $i++;
@@ -115,7 +118,6 @@
                        }
 
                        $GLOBALS['phpgw']->hooks->process($_hookname);
-
                        if (count($GLOBALS['menuData']) >= 1) 
                        {
                                $result = 
$this->display_section($GLOBALS['menuData']);