[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] phpgwapi/inc/class.setup_detection.inc.php, 1.6.2.9.2
From: |
nomail |
Subject: |
[Phpgroupware-cvs] phpgwapi/inc/class.setup_detection.inc.php, 1.6.2.9.2.2 |
Date: |
Thu, 30 Dec 2004 05:51:47 +0100 |
Update of /phpgwapi/inc
Modified Files:
Branch: proposed-0_9_18-branch
class.setup_detection.inc.php
date: 2004/12/30 04:51:47; author: skwashd; state: Exp; lines: +4 -4
Log Message:
switch to ADOdb
=====================================================================
Index: phpgwapi/inc/class.setup_detection.inc.php
diff -u phpgwapi/inc/class.setup_detection.inc.php:1.6.2.9.2.1
phpgwapi/inc/class.setup_detection.inc.php:1.6.2.9.2.2
--- phpgwapi/inc/class.setup_detection.inc.php:1.6.2.9.2.1 Sun Oct 31
13:49:35 2004
+++ phpgwapi/inc/class.setup_detection.inc.php Thu Dec 30 04:51:47 2004
@@ -51,7 +51,7 @@
{
foreach($tables as $key => $val)
{
- $tname[] = $val['table_name'];
+ $tname[] = $val;
}
$newapps = in_array('phpgw_applications',$tname);
$oldapps = in_array('applications',$tname);
@@ -290,7 +290,7 @@
/* no tables, so checking if we can create them
*/
$GLOBALS['phpgw_setup']->db->query('CREATE
TABLE phpgw_testrights ( testfield varchar(5) NOT NULL )',__LINE__,__FILE__);
ob_end_clean();//dump the output
- if($GLOBALS['phpgw_setup']->db->Link_ID &&
!$GLOBALS['phpgw_setup']->db->Errno)
+ if($GLOBALS['phpgw_setup']->db->link_id() &&
!$GLOBALS['phpgw_setup']->db->Errno)
{
$GLOBALS['phpgw_setup']->db->query('DROP TABLE
phpgw_testrights',__LINE__,__FILE__);
$GLOBALS['phpgw_info']['setup']['header_msg'] = 'Stage 3 (Install
Applications)';
@@ -399,7 +399,7 @@
$tables = Array();
foreach($table_names as $key => $val)
{
- $tables[] = $val['table_name'];
+ $tables[] = $val;
}
foreach($copy[$appname]['tables'] as $key =>
$val)
{
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] phpgwapi/inc/class.setup_detection.inc.php, 1.6.2.9.2.2,
nomail <=