From 53d641bd9a22cfb2fe40003ada42e8cccd282641 Mon Sep 17 00:00:00 2001 From: jengo Date: Thu, 8 Feb 2001 21:46:41 +0000 Subject: [PATCH] Temp fix for setup .. it doesn't like the change from applications to phpgw_applications --- setup/inc/phpgw_setup.inc.php | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/setup/inc/phpgw_setup.inc.php b/setup/inc/phpgw_setup.inc.php index 77ce4c84d3..44ca4909be 100644 --- a/setup/inc/phpgw_setup.inc.php +++ b/setup/inc/phpgw_setup.inc.php @@ -207,8 +207,18 @@ return 4; } }else{ - $phpgw_info["setup"]["header_msg"] = "Stage 1 (Tables appear to be pre-beta)"; - return 2; + $this->db->query("select * from applications"); + while (@$this->db->next_record()) { + if ($this->db->f("app_name") == "admin"){$phpgw_info["setup"]["oldver"]["phpgwapi"] = $this->db->f("app_version");} + $phpgw_info["setup"]["oldver"][$this->db->f("app_name")] = $this->db->f("app_version"); + $phpgw_info["setup"][$this->db->f("app_name")]["title"] = $this->db->f("app_title"); + } + if ($phpgw_info["setup"]["oldver"]["phpgwapi"] != $phpgw_info["server"]["versions"]["phpgwapi"]){ + return 4; + } else { + $phpgw_info["setup"]["header_msg"] = "Stage 1 (Tables appear to be pre-beta)"; + return 2; + } } }else{ /* no tables, so checking if we can create them */