[Phpgroupware-cvs] property/inc class.socommon.inc.php

[Sigurd Nes]

CVSROOT:        /sources/phpgroupware
Module name:    property
Branch:         
Changes by:     Sigurd Nes <address@hidden>     06/04/18 12:08:39

Modified files:
        inc            : class.socommon.inc.php 

Log message:
        use clone for new db-object

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/phpgroupware/property/inc/class.socommon.inc.php.diff?tr1=1.19&tr2=1.20&r1=text&r2=text

Patches:
Index: property/inc/class.socommon.inc.php
diff -u property/inc/class.socommon.inc.php:1.19 
property/inc/class.socommon.inc.php:1.20
--- property/inc/class.socommon.inc.php:1.19    Mon Apr 17 11:36:05 2006
+++ property/inc/class.socommon.inc.php Tue Apr 18 12:08:39 2006
@@ -8,7 +8,7 @@
        * @internal Development of this application was funded by 
http://www.bergen.kommune.no/bbb_/ekstern/
        * @package property
        * @subpackage core
-       * @version $Id: class.socommon.inc.php,v 1.19 2006/04/17 11:36:05 
sigurdne Exp $
+       * @version $Id: class.socommon.inc.php,v 1.20 2006/04/18 12:08:39 
sigurdne Exp $
        */
 
        /**
@@ -323,23 +323,30 @@
 
                function new_db()
                {
-                       $db = CreateObject('phpgwapi.db');
-                       if($GLOBALS['phpgw_info']['server']['db_name'])
-                       {
-                               $db->Host = 
$GLOBALS['phpgw_info']['server']['db_host'];
-                               $db->Type = 
$GLOBALS['phpgw_info']['server']['db_type'];
-                               $db->Database = 
$GLOBALS['phpgw_info']['server']['db_name'];
-                               $db->User = 
$GLOBALS['phpgw_info']['server']['db_user'];
-                               $db->Password = 
$GLOBALS['phpgw_info']['server']['db_pass'];
-                       }
-                       else
-                       {
-                               $ConfigDomain = 
get_var('ConfigDomain',array('COOKIE','POST'));
-                               $phpgw_domain = $GLOBALS['phpgw_domain'];
-                               $db->Host     = 
$phpgw_domain[$ConfigDomain]['db_host'];
-                               $db->Database = 
$phpgw_domain[$ConfigDomain]['db_name'];
-                               $db->User     = 
$phpgw_domain[$ConfigDomain]['db_user'];
-                               $db->Password = 
$phpgw_domain[$ConfigDomain]['db_pass'];
+                       if(is_object($GLOBALS['phpgw']->db))
+                       {
+                               $db = clone($GLOBALS['phpgw']->db);
+                       }
+                       else
+                       {
+                               $db = CreateObject('phpgwapi.db');
+                               if($GLOBALS['phpgw_info']['server']['db_name'])
+                               {
+                                       $db->Host = 
$GLOBALS['phpgw_info']['server']['db_host'];
+                                       $db->Type = 
$GLOBALS['phpgw_info']['server']['db_type'];
+                                       $db->Database = 
$GLOBALS['phpgw_info']['server']['db_name'];
+                                       $db->User = 
$GLOBALS['phpgw_info']['server']['db_user'];
+                                       $db->Password = 
$GLOBALS['phpgw_info']['server']['db_pass'];
+                               }
+                               else
+                               {
+                                       $ConfigDomain = 
get_var('ConfigDomain',array('COOKIE','POST'));
+                                       $phpgw_domain = 
$GLOBALS['phpgw_domain'];
+                                       $db->Host     = 
$phpgw_domain[$ConfigDomain]['db_host'];
+                                       $db->Database = 
$phpgw_domain[$ConfigDomain]['db_name'];
+                                       $db->User     = 
$phpgw_domain[$ConfigDomain]['db_user'];
+                                       $db->Password = 
$phpgw_domain[$ConfigDomain]['db_pass'];
+                               }
                        }
 
                        return $db;