check_db now takes $setup_info

This commit is contained in:
Miles Lott 2004-01-07 09:19:38 +00:00
parent 2808518560
commit 27619fb663

View File

@ -250,9 +250,9 @@
return '10'; return '10';
} }
function check_db() function check_db($setup_info='')
{ {
$setup_info = $GLOBALS['setup_info']; $setup_info = $setup_info ? $setup_info : $GLOBALS['setup_info'];
$GLOBALS['phpgw_setup']->db->Halt_On_Error = 'no'; $GLOBALS['phpgw_setup']->db->Halt_On_Error = 'no';
// _debug_array($setup_info); // _debug_array($setup_info);
@ -273,7 +273,7 @@
{ {
$setup_info = $this->get_db_versions($setup_info); $setup_info = $this->get_db_versions($setup_info);
} }
// _debug_array($setup_info); // _debug_array($setup_info);
if (isset($setup_info['phpgwapi']['currentver'])) if (isset($setup_info['phpgwapi']['currentver']))
{ {
if(@$setup_info['phpgwapi']['currentver'] == @$setup_info['phpgwapi']['version']) if(@$setup_info['phpgwapi']['currentver'] == @$setup_info['phpgwapi']['version'])