[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] phpgwapi/inc class.db.inc.php, 1.11 class.setup_proce
From: |
fipsfuchs |
Subject: |
[Phpgroupware-cvs] phpgwapi/inc class.db.inc.php, 1.11 class.setup_process.inc.php, 1.11 class.setup.inc.php, 1.21 |
Date: |
Thu, 24 Feb 2005 15:58:56 -0000 |
Update of phpgwapi/inc
Modified Files:
Branch: MAIN
class.db.inc.php lines: +5 -1
class.setup_process.inc.php lines: +2 -2
class.setup.inc.php lines: +2 -2
Log Message:
adodb fixes
====================================================
Index: phpgwapi/inc/class.db.inc.php
diff -u phpgwapi/inc/class.db.inc.php:1.10 phpgwapi/inc/class.db.inc.php:1.11
--- phpgwapi/inc/class.db.inc.php:1.10 Thu Dec 30 06:47:30 2004
+++ phpgwapi/inc/class.db.inc.php Sun Jan 9 01:46:39 2005
@@ -492,6 +492,10 @@
{
//echo "depi: table_names";
//_debug_array(debug_backtrace());
+ if(!$this->adodb->isConnected())
+ {
+ $this->connect();
+ }
return $this->adodb->MetaTables('TABLES');
}
====================================================
Index: phpgwapi/inc/class.setup_process.inc.php
diff -u phpgwapi/inc/class.setup_process.inc.php:1.10
phpgwapi/inc/class.setup_process.inc.php:1.11
--- phpgwapi/inc/class.setup_process.inc.php:1.10 Thu Dec 30 06:47:31 2004
+++ phpgwapi/inc/class.setup_process.inc.php Sun Jan 9 01:46:39 2005
@@ -199,7 +199,7 @@
$tablenames =
$GLOBALS['phpgw_setup']->db->table_names();
while(list($key,$val) = @each($tablenames))
{
- $tables[] = $val['table_name'];
+ $tables[] = $val;
}
@reset($setup_info);
====================================================
Index: phpgwapi/inc/class.setup.inc.php
diff -u phpgwapi/inc/class.setup.inc.php:1.20
phpgwapi/inc/class.setup.inc.php:1.21
--- phpgwapi/inc/class.setup.inc.php:1.20 Thu Dec 30 06:47:31 2004
+++ phpgwapi/inc/class.setup.inc.php Sun Jan 9 01:46:39 2005
@@ -288,7 +288,7 @@
$tablenames = $this->db->table_names();
foreach($tablenames as $key => $val)
{
- $tables[] = $val['table_name'];
+ $tables[] = $val;
}
if(in_array('phpgw_app_sessions',$tables))
{
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] phpgwapi/inc class.db.inc.php, 1.11 class.setup_process.inc.php, 1.11 class.setup.inc.php, 1.21,
fipsfuchs <=