[Phpgroupware-cvs] api class.phpgw.php, 1.1.1.1.2.17, 1.1.1.1.2.18 starter.inc.php, 1.1.1.1.2.14, 1.1.1.1.2.15

[Dan Kuykendall <address@hidden>]

Update of /cvsroot/phpgroupware/api
In directory subversions:/tmp/cvs-serv11696/api

Modified Files:
      Tag: proposal-branch
        class.phpgw.php starter.inc.php 
Log Message:
fixed crash bug involving setup

Index: starter.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/api/starter.inc.php,v
retrieving revision 1.1.1.1.2.14
retrieving revision 1.1.1.1.2.15
diff -C2 -d -r1.1.1.1.2.14 -r1.1.1.1.2.15
*** starter.inc.php     31 Oct 2003 04:33:46 -0000      1.1.1.1.2.14
--- starter.inc.php     31 Oct 2003 19:00:43 -0000      1.1.1.1.2.15
***************
*** 45,49 ****
        magic_quotes_runtime(false);
  
- 
        
/****************************************************************************\
        * Make sure we have a valid client type                                 
     *
--- 45,48 ----
***************
*** 172,175 ****
--- 171,178 ----
                /* Check the login */
                $GLOBALS['phpgw']->check_login();
+       }
+       else
+       {
+               $GLOBALS['phpgw']->lang = createobject('api_lang');
        }
  

Index: class.phpgw.php
===================================================================
RCS file: /cvsroot/phpgroupware/api/class.phpgw.php,v
retrieving revision 1.1.1.1.2.17
retrieving revision 1.1.1.1.2.18
diff -C2 -d -r1.1.1.1.2.17 -r1.1.1.1.2.18
*** class.phpgw.php     31 Oct 2003 08:42:33 -0000      1.1.1.1.2.17
--- class.phpgw.php     31 Oct 2003 19:00:43 -0000      1.1.1.1.2.18
***************
*** 242,247 ****
                        $args = $args->get(func_get_args(),__LINE__,__FILE__);
  
!                       /* Make sure the base classes are loaded. */
!                       $this->load_base_classes();
  
                        /* Check to see if we should load the main xsl */
--- 242,250 ----
                        $args = $args->get(func_get_args(),__LINE__,__FILE__);
  
!                       if(!$GLOBALS['missing_critical'])
!                       {
!                               /* Make sure the base classes are loaded. */
!                               $this->load_base_classes();
!                       }
  
                        /* Check to see if we should load the main xsl */
***************
*** 284,294 ****
                        }
  
!                       /* If any, add the hooks to the API XML node */
!                       if(count($this->hooks->data) > 0)
                        {
!                               
$GLOBALS['phpgw_xml_apinode']->add_node($this->hooks->data,'hooks');
!                       }
  
!                       
$GLOBALS['phpgw_xml_apinode']->add_node($this->apimenu(),'apimenu');
                        
                        /* Add the css files to the API XML node */
--- 287,300 ----
                        }
  
!                       if(!$GLOBALS['missing_critical'])
                        {
!                               /* If any, add the hooks to the API XML node */
!                               if(count($this->hooks->data) > 0)
!                               {
!                                       
$GLOBALS['phpgw_xml_apinode']->add_node($this->hooks->data,'hooks');
!                               }
  
!                               
$GLOBALS['phpgw_xml_apinode']->add_node($this->apimenu(),'apimenu');
!                       }
                        
                        /* Add the css files to the API XML node */