diff --git a/setup/sql/mysql_newtables.inc.php b/setup/sql/mysql_newtables.inc.php index 07e9a7a178..b9db32e495 100644 --- a/setup/sql/mysql_newtables.inc.php +++ b/setup/sql/mysql_newtables.inc.php @@ -92,19 +92,6 @@ li int, lo varchar(255) )"; - $phpgw_setup->db->query($sql); - - // Note: This table will be removed durring 0.9.11 - $sql = "CREATE TABLE profiles ( - con int(11) DEFAULT '0' NOT NULL auto_increment, - owner varchar(20), - title varchar(255), - phone_number varchar(255), - comments text, - picture_format varchar(255), - picture blob, - PRIMARY KEY (con) - )"; $phpgw_setup->db->query($sql); $sql = "CREATE TABLE phpgw_addressbook ( diff --git a/setup/sql/mysql_upgrade_beta.inc.php b/setup/sql/mysql_upgrade_beta.inc.php index fac585bd02..a72f7a9ae9 100644 --- a/setup/sql/mysql_upgrade_beta.inc.php +++ b/setup/sql/mysql_upgrade_beta.inc.php @@ -1650,6 +1650,16 @@ $phpgw_info['setup']['currentver']['phpgwapi'] = '0.9.11.008'; } + $test[] = '0.9.11.008'; + function upgrade0_9_11_008() + { + global $phpgw_info,$phpgw_setup; + + $phpgw_setup->db->query("drop table profiles",__LINE__,__TABLE__); + + $phpgw_info['setup']['currentver']['phpgwapi'] = '0.9.11.009'; + } + reset ($test); while (list ($key, $value) = each ($test)){ if ($phpgw_info["setup"]["currentver"]["phpgwapi"] == $value) { diff --git a/setup/sql/pgsql_droptables.inc.php b/setup/sql/pgsql_droptables.inc.php index 781d0446df..885a78411f 100644 --- a/setup/sql/pgsql_droptables.inc.php +++ b/setup/sql/pgsql_droptables.inc.php @@ -32,9 +32,6 @@ $phpgw_setup->db->query("DROP TABLE phpgw_hooks"); $phpgw_setup->db->query("drop sequence phpgw_hooks_hook_id_seq"); - $phpgw_setup->db->query("DROP TABLE profiles"); - $phpgw_setup->db->query("drop sequence profiles_con_seq"); - $phpgw_setup->db->query("DROP TABLE phpgw_addressbook"); $phpgw_setup->db->query("DROP TABLE phpgw_addressbook_extra"); $phpgw_setup->db->query("drop sequence phpgw_addressbook_id_seq"); diff --git a/setup/sql/pgsql_newtables.inc.php b/setup/sql/pgsql_newtables.inc.php index 18e86eb93d..80844be609 100644 --- a/setup/sql/pgsql_newtables.inc.php +++ b/setup/sql/pgsql_newtables.inc.php @@ -91,18 +91,6 @@ li int, lo varchar(255) )"; - $phpgw_setup->db->query($sql); - - // Note: This table will be removed durring 0.9.11 - $sql = "CREATE TABLE profiles ( - con serial, - owner varchar(20), - title varchar(255), - phone_number varchar(255), - comments text, - picture_format varchar(255), - picture text - )"; $phpgw_setup->db->query($sql); $sql = "CREATE TABLE phpgw_addressbook( diff --git a/setup/sql/pgsql_upgrade_beta.inc.php b/setup/sql/pgsql_upgrade_beta.inc.php index a06e05216e..86c1636c76 100644 --- a/setup/sql/pgsql_upgrade_beta.inc.php +++ b/setup/sql/pgsql_upgrade_beta.inc.php @@ -2169,6 +2169,17 @@ $phpgw_info['setup']['currentver']['phpgwapi'] = '0.9.11.008'; } + $test[] = '0.9.11.008'; + function upgrade0_9_11_008() + { + global $phpgw_info,$phpgw_setup; + + $phpgw_setup->db->query("drop table profiles",__LINE__,__TABLE__); + $phpgw_setup->db->query("drop sequence profiles_con_seq",__LINE__,__TABLE__); + + $phpgw_info['setup']['currentver']['phpgwapi'] = '0.9.11.009'; + } + reset ($test); while (list ($key, $value) = each ($test)){ if ($phpgw_info["setup"]["currentver"]["phpgwapi"] == $value) { diff --git a/version.inc.php b/version.inc.php index 0270bdb36c..81ad205245 100644 --- a/version.inc.php +++ b/version.inc.php @@ -11,5 +11,5 @@ /* $Id$ */ - $phpgw_info['server']['versions']['phpgwapi'] = '0.9.11.008'; + $phpgw_info['server']['versions']['phpgwapi'] = '0.9.11.009'; $phpgw_info['server']['versions']['current_header'] = '1.11';