[Phpgroupware-cvs] phpgwapi/inc functions.inc.php, 1.121.2.13.2.13, 1.121.2.13.2.14

[Mark A Peters <address@hidden>]

Update of /cvsroot/phpgroupware/phpgwapi/inc
In directory subversions:/tmp/cvs-serv14877

Modified Files:
      Tag: Version-0_9_16-branch
        functions.inc.php 
Log Message:
Changed the location of where menuaction will be acquired.  Should be after the 
user validates and not if hom/login pages being displayed.

Index: functions.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/functions.inc.php,v
retrieving revision 1.121.2.13.2.13
retrieving revision 1.121.2.13.2.14
diff -C2 -d -r1.121.2.13.2.13 -r1.121.2.13.2.14
*** functions.inc.php   29 Sep 2003 00:13:15 -0000      1.121.2.13.2.13
--- functions.inc.php   29 Sep 2003 00:20:16 -0000      1.121.2.13.2.14
***************
*** 206,218 ****
  
        
/************************************************************************\
-       * Load the menuaction                                                   
 *
-       
\************************************************************************/
-       $GLOBALS['phpgw_info']['menuaction'] = 
get_var('menuaction',Array('GET','POST'));
-       if(!$GLOBALS['phpgw_info']['menuaction'])
-       {
-               unset($GLOBALS['phpgw_info']['menuaction']);
-       }
- 
-       
/************************************************************************\
        * Required classes                                                      
 *
        
\************************************************************************/
--- 206,209 ----
***************
*** 311,314 ****
--- 302,314 ----
                define('PHPGW_ACL_PRIVATE',16);
                */
+ 
+       
/************************************************************************\
+       * Load the menuaction                                                   
 *
+       
\************************************************************************/
+               $GLOBALS['phpgw_info']['menuaction'] = 
get_var('menuaction',Array('GET','POST'));
+               if(!$GLOBALS['phpgw_info']['menuaction'])
+               {
+                       unset($GLOBALS['phpgw_info']['menuaction']);
+               }
  
                /********* This sets the user variables *********/