Misc trivial tweaks, mark as 2.2.3

johnbillion · Apr 17, 2012 · 3eaf53b · 3eaf53b
1 parent 817c528
commit 3eaf53b
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 18 deletions.
diff --git a/components/db_queries.php b/components/db_queries.php
@@ -225,17 +225,14 @@ function add_component_time( $component, $ltime, $type ) {
 
 	function process_db_object( $id, $db ) {
 
-		$rows          = array();
-		$types         = array();
-		$total_time    = 0;
-		$total_qs      = 0;
-		$has_results   = false;
-		$has_components= false;
+		$rows       = array();
+		$types      = array();
+		$total_time = 0;
+		$total_qs   = 0;
 
 		foreach ( (array) $db->queries as $query ) {
 
-			# @TODO: is this needed now?
-			if ( false !== strpos( $query[2], 'wp_admin_bar' ) and !isset( $_REQUEST['qm_display_all'] ) )
+			if ( false !== strpos( $query[2], 'wp_admin_bar' ) and !isset( $_REQUEST['qm_display_admin_bar'] ) )
 				continue;
 
 			$sql           = $query[0];
@@ -301,7 +298,7 @@ function process_db_object( $id, $db ) {
 			else
 				$func = reset( array_reverse( explode( ', ', $funcs ) ) );
 
-			$sql = $this->format_sql( $sql );
+			$sql  = $this->format_sql( $sql );
 			$type = preg_split( '/\b/', $sql );
 			$type = strtoupper( $type[1] );
 

diff --git a/components/environment.php b/components/environment.php
@@ -149,7 +149,7 @@ function output( $args, $data ) {
 			$append = '';
 
 			if ( $val['after'] != $val['before'] )
-				$append .= '<br /><span class="qm-info">' . sprintf( __( 'Overridden from %s', 'query-monitor' ), $val['before'] ) . '</span>';
+				$append .= '<br /><span class="qm-info">' . sprintf( __( 'Overridden at runtime from %s', 'query-monitor' ), $val['before'] ) . '</span>';
 
 			echo '<tr>';
 			echo "<td>{$key}</td>";

diff --git a/query-monitor.php b/query-monitor.php
@@ -2,7 +2,7 @@
 /*
 Plugin Name: Query Monitor
 Description: Monitoring of database queries, hooks, conditionals and more.
-Version:     2.2.3b
+Version:     2.2.3
 Author:      John Blackbourn
 Author URI:  http://lud.icro.us/
 Text Domain: query-monitor

diff --git a/wp-content/db.php b/wp-content/db.php
@@ -1,7 +1,7 @@
 <?php
 /*
 Plugin Name: Query Monitor
-Version:     2.2.3b
+Version:     2.2.3
 
 Move this file into your wp-content directory to provide additional
 database query information in Query Monitor's output.
@@ -146,10 +146,6 @@ function query( $query ) {
 		return $return_val;
 	}
 
-	function get_caller( $_trace ) {
-		return implode( ', ', array_reverse( $this->backtrace( $_trace ) ) );
-	}
-
 	function get_stack( $_trace ) {
 
 		$stack  = array();
@@ -165,7 +161,7 @@ function get_stack( $_trace ) {
 
 	}
 
-	function backtrace( $_trace ) {
+	function get_caller( $_trace ) {
 
 		if ( !$this->qm_filtered and function_exists( 'did_action' ) and did_action( 'plugins_loaded' ) ) {
 
@@ -185,7 +181,7 @@ function backtrace( $_trace ) {
 			$file = str_replace( $path, '', $file );
 			$trace[] = $file;
 		}
-		return $trace;
+		return implode( ', ', array_reverse( $trace ) );
 	}
 
 	function _filter_trace( $trace ) {