[Phpgroupware-cvs] CVS: phpgwapi/setup tables_update.inc.php, 1.53.2.9.2.15, 1.53.2.9.2.16

[Dave Hall <address@hidden>]

Update of /cvsroot/phpgroupware/phpgwapi/setup
In directory subversions:/tmp/cvs-serv31526

Modified Files:
      Tag: Version-0_9_16-branch
        tables_update.inc.php 
Log Message:
fix for bug #5175


Index: tables_update.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/setup/tables_update.inc.php,v
retrieving revision 1.53.2.9.2.15
retrieving revision 1.53.2.9.2.16
diff -C2 -r1.53.2.9.2.15 -r1.53.2.9.2.16
*** tables_update.inc.php       8 Sep 2003 13:26:38 -0000       1.53.2.9.2.15
--- tables_update.inc.php       9 Sep 2003 23:51:52 -0000       1.53.2.9.2.16
***************
*** 1280,1284 ****
                          $db1->query("INSERT INTO phpgw_contact_addr 
(contact_id,add1,
                        city, state, postal_code, country, tz, addr_type_id,
!                       created_on, created_by, modified_on, modified_by, 
addr_type_id) VALUES (" 
                        . $GLOBALS['phpgw_setup']->oProc->f('org_id') 
                        . ", '" . 
$db1->db_addslashes($GLOBALS['phpgw_setup']->oProc->f('adr_one_street')) ." '"
--- 1280,1284 ----
                          $db1->query("INSERT INTO phpgw_contact_addr 
(contact_id,add1,
                        city, state, postal_code, country, tz, addr_type_id,
!                       created_on, created_by, modified_on, modified_by) 
VALUES ("
                        . $GLOBALS['phpgw_setup']->oProc->f('org_id') 
                        . ", '" . 
$db1->db_addslashes($GLOBALS['phpgw_setup']->oProc->f('adr_one_street')) ." '"
***************
*** 1288,1297 ****
                        . ", '" . 
$db1->db_addslashes($GLOBALS['phpgw_setup']->oProc->f('adr_one_countryname')) 
." '"
                        . ", " . intval($GLOBALS['phpgw_setup']->oProc->f('tz'))
!                       . ", " . 
$GLOBALS['phpgw_setup']->oProc->f('addr_type_id') 
                        . ", " . 
$GLOBALS['phpgw_setup']->oProc->f('created_on') 
                        . ", " . 
$GLOBALS['phpgw_setup']->oProc->f('created_by') 
                        . ", " . 
$GLOBALS['phpgw_setup']->oProc->f('modified_on') 
                        . ", " . 
$GLOBALS['phpgw_setup']->oProc->f('modified_by')
-                       . ", " . intval($addr_type)
                        .  ");");
                  }
--- 1288,1296 ----
                        . ", '" . 
$db1->db_addslashes($GLOBALS['phpgw_setup']->oProc->f('adr_one_countryname')) 
." '"
                        . ", " . intval($GLOBALS['phpgw_setup']->oProc->f('tz'))
!                       . ", " . 
($GLOBALS['phpgw_setup']->oProc->f('addr_type_id') )? 
$GLOBALS['phpgw_setup']->oProc->f('addr_type_id') : $addr_type 
                        . ", " . 
$GLOBALS['phpgw_setup']->oProc->f('created_on') 
                        . ", " . 
$GLOBALS['phpgw_setup']->oProc->f('created_by') 
                        . ", " . 
$GLOBALS['phpgw_setup']->oProc->f('modified_on') 
                        . ", " . 
$GLOBALS['phpgw_setup']->oProc->f('modified_by')
                        .  ");");
                  }
***************
*** 1314,1324 ****
                        . ", '" . 
$db1->db_addslashes($GLOBALS['phpgw_setup']->oProc->f('adr_two_postalcode')) ." 
'"
                        . ", '" . 
$db1->db_addslashes($GLOBALS['phpgw_setup']->oProc->f('adr_two_countryname')) 
." '"
!                       . ", " . 
intval($GLOBALS['phpgw_setup']->oProc->f('tz'))                
!                       . ", " . 
$GLOBALS['phpgw_setup']->oProc->f('addr_type_id') 
                        . ", " . 
$GLOBALS['phpgw_setup']->oProc->f('created_on') 
                        . ", " . 
$GLOBALS['phpgw_setup']->oProc->f('created_by') 
                        . ", " . 
$GLOBALS['phpgw_setup']->oProc->f('modified_on') 
                        . ", " . 
$GLOBALS['phpgw_setup']->oProc->f('modified_by') 
-                       . ", " . intval($addr_type)
                        .  ");");
                  }
--- 1313,1322 ----
                        . ", '" . 
$db1->db_addslashes($GLOBALS['phpgw_setup']->oProc->f('adr_two_postalcode')) ." 
'"
                        . ", '" . 
$db1->db_addslashes($GLOBALS['phpgw_setup']->oProc->f('adr_two_countryname')) 
." '"
!                       . ", " . intval($GLOBALS['phpgw_setup']->oProc->f('tz'))
!                       . ", " . 
($GLOBALS['phpgw_setup']->oProc->f('addr_type_id')) ? 
$GLOBALS['phpgw_setup']->oProc->f('addr_type_id') : $addr_type
                        . ", " . 
$GLOBALS['phpgw_setup']->oProc->f('created_on') 
                        . ", " . 
$GLOBALS['phpgw_setup']->oProc->f('created_by') 
                        . ", " . 
$GLOBALS['phpgw_setup']->oProc->f('modified_on') 
                        . ", " . 
$GLOBALS['phpgw_setup']->oProc->f('modified_by') 
                        .  ");");
                  }