Changeset 6342

Timestamp:

11/21/07 00:14:58 (11 months ago)

Author:

ryan

Message:

Debug backtrace for queries. Props tellyworth. fixes #5218

Files:

• trunk/wp-includes/wp-db.php (modified) (2 diffs)

trunk/wp-includes/wp-db.php

@@ -229 +229 @@
-
-        if (SAVEQUERIES)
-
+, $this->get_caller()
-
-        // If there is an error then take note of it..
@@ -476 +476 @@
-        return ( version_compare(mysql_get_server_info(), '4.1.0', '>=') );
-    }
+
+    /**
+     * Get the name of the function that called wpdb.
+     * @return string the name of the calling function
+     */
+    function get_caller() {
+        // requires PHP 4.3+
+        if ( !is_callable('debug_backtrace') )
+            return '';
+
+        $bt = debug_backtrace();
+        $caller = '';
+
+        foreach ( $bt as $trace ) {
+            if ( @$trace['class'] == __CLASS__ )
+                continue;
+            elseif ( strtolower(@$trace['function']) == 'call_user_func_array' )
+                continue;
+            elseif ( strtolower(@$trace['function']) == 'apply_filters' )
+                continue;
+            elseif ( strtolower(@$trace['function']) == 'do_action' )
+                continue;
+    
+            $caller = $trace['function'];
+            break;
+        }
+        return $caller;
+    }
+
-}
-