R25225 - /trunk/setup/inc/class.setup.inc.php

Author: ralfbecker
New Revision: 25225

URL: http://www.egroupware.org/viewvc?rev=3D25225&view=3Drev
Log:
“fixed fatal error “Exception thrown without a stack frame in Unknown on l=
ine 0”, if DB does not exist when calling setup”

Modified:
trunk/setup/inc/class.setup.inc.php

Modified: trunk/setup/inc/class.setup.inc.php
URL: http://www.egroupware.org/viewvc/trunk/setup/inc/class.setup.inc.php?r=
ev=3D25225&r1=3D25224&r2=3D25225&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
— trunk/setup/inc/class.setup.inc.php (original)
+++ trunk/setup/inc/class.setup.inc.php Tue Apr 1 11:16:03 2008
@@ -97,14 +97,20 @@
$GLOBALS[‘egw_info’][‘server’][‘db_persistent’] =3D False;
}
$GLOBALS[‘egw’]->db =3D $this->db =3D new egw_db();

  •   $this->db->connect(
    
  •   	$GLOBALS['egw_domain'][$this->ConfigDomain]['db_name'],
    
  •   	$GLOBALS['egw_domain'][$this->ConfigDomain]['db_host'],
    
  •   	$GLOBALS['egw_domain'][$this->ConfigDomain]['db_port'],
    
  •   	$GLOBALS['egw_domain'][$this->ConfigDomain]['db_user'],
    
  •   	$GLOBALS['egw_domain'][$this->ConfigDomain]['db_pass'],
    
  •   	$GLOBALS['egw_domain'][$this->ConfigDomain]['db_type']
    
  •   );
    
  •   try {
    
  •   	$this->db->connect(
    
  •   		$GLOBALS['egw_domain'][$this->ConfigDomain]['db_name'],
    
  •   		$GLOBALS['egw_domain'][$this->ConfigDomain]['db_host'],
    
  •   		$GLOBALS['egw_domain'][$this->ConfigDomain]['db_port'],
    
  •   		$GLOBALS['egw_domain'][$this->ConfigDomain]['db_user'],
    
  •   		$GLOBALS['egw_domain'][$this->ConfigDomain]['db_pass'],
    
  •   		$GLOBALS['egw_domain'][$this->ConfigDomain]['db_type']
    
  •   	);
    
  •   }
    
  •   catch (Exception $e) {
    
  •   	return;
    
  •   }
      $this->db->set_app('phpgwapi');
      =
    
      if ($connect_and_setcharset)
    

Check out the new SourceForge.net Marketplace.
It’s the best place to buy or sell services for
just about anything Open Source.
http://ad.doubleclick.net/clk;164216239;13503038;w?http://sf.net/marketplace


eGroupWare-cvs mailing list
eGroupWare-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/egroupware-cvs