From 35c89c43f194045a5675821dd17c6e0cd996a35e Mon Sep 17 00:00:00 2001 From: Miles Lott Date: Wed, 21 Mar 2001 17:16:16 +0000 Subject: [PATCH] fix email type field in upgrade for 16-18 --- setup/sql/mysql_upgrade_beta.inc.php | 2 +- setup/sql/pgsql_upgrade_beta.inc.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/setup/sql/mysql_upgrade_beta.inc.php b/setup/sql/mysql_upgrade_beta.inc.php index c984022498..41484745f0 100644 --- a/setup/sql/mysql_upgrade_beta.inc.php +++ b/setup/sql/mysql_upgrade_beta.inc.php @@ -1273,7 +1273,7 @@ $phpgw_setup->db->query("alter table phpgw_addressbook change b_tel_msg tel_video varchar(40) DEFAULT '+1 (000) 000-0000' NOT NULL"); $phpgw_setup->db->query("alter table phpgw_addressbook change a_tel_prefer tel_prefer varchar(32)"); $phpgw_setup->db->query("alter table phpgw_addressbook change d_email email varchar(64)"); - $phpgw_setup->db->query("alter table phpgw_addressbook change d_email_type email_type varchar(32) DEFAULT 'INTERNET' NOT NULL"); + $phpgw_setup->db->query("alter table phpgw_addressbook change d_emailtype email_type varchar(32) DEFAULT 'INTERNET' NOT NULL"); $phpgw_setup->db->query("alter table phpgw_addressbook change d_email_work email_home varchar(64)"); $phpgw_setup->db->query("alter table phpgw_addressbook change d_email_home email_home_type varchar(32) DEFAULT 'INTERNET' NOT NULL"); $phpgw_setup->db->query("alter table phpgw_addressbook drop b_tel_prefer"); diff --git a/setup/sql/pgsql_upgrade_beta.inc.php b/setup/sql/pgsql_upgrade_beta.inc.php index 24d611048b..22c9ee2bee 100644 --- a/setup/sql/pgsql_upgrade_beta.inc.php +++ b/setup/sql/pgsql_upgrade_beta.inc.php @@ -1518,7 +1518,7 @@ $fields['n_given'] = $phpgw_setup->db->f("firstname"); $fields['n_family'] = $phpgw_setup->db->f("lastname"); $fields['email'] = $phpgw_setup->db->f("d_email"); - $fields['email_type'] = $phpgw_setup->db->f("d_email_type"); + $fields['email_type'] = $phpgw_setup->db->f("d_emailtype"); $fields['tel_home'] = $phpgw_setup->db->f("hphone"); $fields['tel_work'] = $phpgw_setup->db->f("wphone"); $fields['tel_fax'] = $phpgw_setup->db->f("fax");