Changeset 1288 in ExiteCMS

Timestamp:

02/17/08 13:43:04 (4 years ago)

Author:

hverton

Message:

modified dbcount() to support tablenames prefixed with a database name (i.e. "database.table")
modified dbtable_exists() to support tablenames prefixed with a database name (i.e. "database.table")

File:

• trunk/includes/db_functions.php (modified) (3 diffs)

trunk/includes/db_functions.php

@@ -110 +110 @@
 
     $cond = ($conditions ? " WHERE ".$conditions : "");
-    $sql = "SELECT Count".$field." FROM ".$db_prefix.$table.$cond;
-    
+    $sql = "SELECT Count".$field." FROM ".(strpos($table, ".") ? $table : $db_prefix.$table).$cond;
+
     $result = dbquery($sql, false);
     if (!$result) {
@@ -183 +183 @@
     $_loadstats['querytime'] -= $_s_loadtime;
 
-    $db_select = @mysql_select_db( ($db != "" && $db != $db_name) ? $db :$db_name );
+    if (!empty($db) && $db != $db_name) {
+        $db_select = @mysql_select_db($db);
+        if (!$db_select) return false;
+    }
     $result = @mysql_query("SHOW TABLES");
     while ($data = @mysql_fetch_array($result)) { 
@@ -189 +192 @@
     }
     @mysql_free_result($result);
+    $db_select = @mysql_select_db($db_name );
     
     $_loadstats['queries']++;