Changeset 53 for trunk/lib/DB.inc.php

Timestamp:

Jan 26, 2006 8:19:32 PM (18 years ago)

Author:

scdev

Message:

${1}

File:

• trunk/lib/DB.inc.php (modified) (9 diffs)

trunk/lib/DB.inc.php

@@ -85 +85 @@
     function setParam($params)
     {
-        if (!isset($this) || !is_a($this, 'DB')) {
+        if (!isset($this) || !is_a($this, 'DB') && !is_subclass_of($this, 'DB')) {
             $this =& DB::getInstance();
         }
@@ -108 +108 @@
     function getParam($param)
     {
-        if (!isset($this) || !is_a($this, 'DB')) {
+        if (!isset($this) || !is_a($this, 'DB') && !is_subclass_of($this, 'DB')) {
             $this =& DB::getInstance();
         }
@@ -129 +129 @@
     function connect()
     {
-        if (!isset($this) || !is_a($this, 'DB')) {
+        if (!isset($this) || !is_a($this, 'DB') && !is_subclass_of($this, 'DB')) {
             $this =& DB::getInstance();
         }
@@ -142 +142 @@
             // Select database
             mysql_select_db($this->getParam('db_name'), $this->dbh);
+        } else {
+            App::logMsg(sprintf('mysql_connect failed.', null), LOG_ERR, __FILE__, __LINE__);
         }
 
@@ -183 +185 @@
     function close()
     {
-        if (!isset($this) || !is_a($this, 'DB')) {
+        if (!isset($this) || !is_a($this, 'DB') && !is_subclass_of($this, 'DB')) {
             $this =& DB::getInstance();
         }
@@ -204 +206 @@
     function getDBH()
     {
-        if (!isset($this) || !is_a($this, 'DB')) {
+        if (!isset($this) || !is_a($this, 'DB') && !is_subclass_of($this, 'DB')) {
             $this =& DB::getInstance();
         }
@@ -239 +241 @@
         static $_query_count = 0;
 
-        if (!isset($this) || !is_a($this, 'DB')) {
+        if (!isset($this) || !is_a($this, 'DB') && !is_subclass_of($this, 'DB')) {
             $this =& DB::getInstance();
         }
@@ -285 +287 @@
     function tableExists($table, $use_cached_results=true)
     {
-        if (!isset($this) || !is_a($this, 'DB')) {
+        if (!isset($this) || !is_a($this, 'DB') && !is_subclass_of($this, 'DB')) {
             $this =& DB::getInstance();
         }
@@ -319 +321 @@
     function columnExists($table, $columns, $strict=true, $use_cached_results=true)
     {
-        if (!isset($this) || !is_a($this, 'DB')) {
+        if (!isset($this) || !is_a($this, 'DB') && !is_subclass_of($this, 'DB')) {
             $this =& DB::getInstance();
         }