Query Monitor - Version 2.11.2

Version Description

Release Info

Developer	johnbillion
Plugin	Query Monitor
Version	2.11.2
Comparing to
See all releases

Code changes from version 2.11.1 to 2.11.2

Files changed (31) hide show

assets/query-monitor.css +7 -1
assets/query-monitor.js +1 -1
classes/Activation.php +116 -0
classes/Backtrace.php +1 -1
classes/Collector.php +2 -1
classes/QueryMonitor.php +79 -0
classes/Util.php +5 -0
collectors/debug_bar.php +1 -0
collectors/http.php +6 -2
collectors/php_errors.php +16 -0
collectors/request.php +5 -0
collectors/theme.php +9 -0
output/Html.php +4 -0
output/headers/overview.php +3 -0
output/html/assets.php +22 -6
output/html/db_callers.php +1 -1
output/html/db_components.php +1 -1
output/html/db_dupes.php +7 -3
output/html/db_queries.php +13 -2
output/html/environment.php +4 -1
output/html/hooks.php +2 -0
output/html/http.php +12 -13
output/html/languages.php +5 -1
output/html/overview.php +5 -2
output/html/php_errors.php +8 -4
output/html/request.php +1 -0
output/html/theme.php +22 -0
output/html/transients.php +1 -0
query-monitor.php +12 -146
readme.txt +3 -390
wp-content/db.php +5 -1

assets/query-monitor.css CHANGED Viewed

	@@ -22,6 +22,10 @@ GNU General Public License for more details.
22	color: #4a4 !important;
23	}
24




25	#wp-admin-bar-query-monitor-notices {
26	background-color: #740 !important;
27	}
	@@ -68,7 +72,8 @@ GNU General Public License for more details.
68	background-color: #c00 !important;
69	}
70
71	- #wpadminbar .qm-error > a {

72	color: #fff !important;
73	}
74
	@@ -121,6 +126,7 @@ GNU General Public License for more details.
121	border-top: 1px solid #ccc !important;
122	padding: 0 0 35px !important;
123	text-align: left !important;

124	display: none;
125	}
126


22	color: #4a4 !important;
23	}
24
25	+ #wpadminbar .qm-alert {
26	+ background-color: #f60;
27	+ }
28	+
29	#wp-admin-bar-query-monitor-notices {
30	background-color: #740 !important;
31	}

72	background-color: #c00 !important;
73	}
74
75	+ #wpadminbar .qm-error > a,
76	+ #wpadminbar .qm-alert > a {
77	color: #fff !important;
78	}
79

126	border-top: 1px solid #ccc !important;
127	padding: 0 0 35px !important;
128	text-align: left !important;
129	+ min-width: 800px !important;
130	display: none;
131	}
132

assets/query-monitor.js CHANGED Viewed

	@@ -108,7 +108,7 @@ jQuery( function($) {
108	return false;
109	};
110
111	- } else if ( window.wp && wp.themes && wp.themes.RunInstaller ) {
112	// Infinite scrolling on Appearance -> Add New screens
113
114	var view = wp.themes.RunInstaller.view.view;


108	return false;
109	};
110
111	+ } else if ( window.wp && wp.themes && wp.themes.RunInstaller && wp.themes.RunInstaller.view ) {
112	// Infinite scrolling on Appearance -> Add New screens
113
114	var view = wp.themes.RunInstaller.view.view;

classes/Activation.php ADDED Viewed

	@@ -0,0 +1,116 @@


1	+ <?php
2	+ /*
3	+ Copyright 2009-2016 John Blackbourn
4	+
5	+ This program is free software; you can redistribute it and/or modify
6	+ it under the terms of the GNU General Public License as published by
7	+ the Free Software Foundation; either version 2 of the License, or
8	+ (at your option) any later version.
9	+
10	+ This program is distributed in the hope that it will be useful,
11	+ but WITHOUT ANY WARRANTY; without even the implied warranty of
12	+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13	+ GNU General Public License for more details.
14	+
15	+ */
16	+
17	+ class QM_Activation extends QM_Plugin {
18	+
19	+ protected function __construct( $file ) {
20	+
21	+ # Filters
22	+ add_filter( 'pre_update_option_active_plugins', array( $this, 'filter_active_plugins' ) );
23	+ add_filter( 'pre_update_site_option_active_sitewide_plugins', array( $this, 'filter_active_sitewide_plugins' ) );
24	+
25	+ # Activation and deactivation
26	+ register_activation_hook( __FILE__, array( $this, 'activate' ) );
27	+ register_deactivation_hook( __FILE__, array( $this, 'deactivate' ) );
28	+
29	+ # Parent setup:
30	+ parent::__construct( $file );
31	+
32	+ }
33	+
34	+ public function activate( $sitewide = false ) {
35	+
36	+ if ( $admins = QM_Util::get_admins() ) {
37	+ $admins->add_cap( 'view_query_monitor' );
38	+ }
39	+
40	+ if ( ! file_exists( $db = WP_CONTENT_DIR . '/db.php' ) && function_exists( 'symlink' ) ) {
41	+ @symlink( plugin_dir_path( __FILE__ ) . 'wp-content/db.php', $db );
42	+ }
43	+
44	+ if ( $sitewide ) {
45	+ update_site_option( 'active_sitewide_plugins', get_site_option( 'active_sitewide_plugins' ) );
46	+ } else {
47	+ update_option( 'active_plugins', get_option( 'active_plugins' ) );
48	+ }
49	+
50	+ }
51	+
52	+ public function deactivate() {
53	+
54	+ if ( $admins = QM_Util::get_admins() ) {
55	+ $admins->remove_cap( 'view_query_monitor' );
56	+ }
57	+
58	+ # Only delete db.php if it belongs to Query Monitor
59	+ if ( class_exists( 'QM_DB' ) ) {
60	+ unlink( WP_CONTENT_DIR . '/db.php' );
61	+ }
62	+
63	+ }
64	+
65	+ public function filter_active_plugins( $plugins ) {
66	+
67	+ // this needs to run on the cli too
68	+
69	+ if ( empty( $plugins ) ) {
70	+ return $plugins;
71	+ }
72	+
73	+ $f = preg_quote( basename( $this->plugin_base() ) );
74	+
75	+ return array_merge(
76	+ preg_grep( '/' . $f . '$/', $plugins ),
77	+ preg_grep( '/' . $f . '$/', $plugins, PREG_GREP_INVERT )
78	+ );
79	+
80	+ }
81	+
82	+ public function filter_active_sitewide_plugins( $plugins ) {
83	+
84	+ if ( empty( $plugins ) ) {
85	+ return $plugins;
86	+ }
87	+
88	+ $f = $this->plugin_base();
89	+
90	+ if ( isset( $plugins[$f] ) ) {
91	+
92	+ unset( $plugins[$f] );
93	+
94	+ return array_merge( array(
95	+ $f => time(),
96	+ ), $plugins );
97	+
98	+ } else {
99	+ return $plugins;
100	+ }
101	+
102	+ }
103	+
104	+ public static function init( $file = null ) {
105	+
106	+ static $instance = null;
107	+
108	+ if ( ! $instance ) {
109	+ $instance = new QM_Activation( $file );
110	+ }
111	+
112	+ return $instance;
113	+
114	+ }
115	+
116	+ }

classes/Backtrace.php CHANGED Viewed

	@@ -51,7 +51,7 @@ class QM_Backtrace {
51	'get_header' => 1,
52	'get_sidebar' => 1,
53	'get_footer' => 1,
54	- '~~get_site_by_path~~' => 3,
55	);
56	protected static $filtered = false;
57	protected $trace = null;


51	'get_header' => 1,
52	'get_sidebar' => 1,
53	'get_footer' => 1,
54	+ 'class_exists' => 2,
55	);
56	protected static $filtered = false;
57	protected $trace = null;

classes/Collector.php CHANGED Viewed

	@@ -80,7 +80,8 @@ abstract class QM_Collector {
80
81	public static function format_bool_constant( $constant ) {
82	if ( !defined( $constant ) ) {
83	- ~~return~~ ~~'undefined';~~

84	} else if ( !constant( $constant ) ) {
85	return 'false';
86	} else {


80
81	public static function format_bool_constant( $constant ) {
82	if ( !defined( $constant ) ) {
83	+ /* translators: Undefined PHP constant */
84	+ return __( 'undefined', 'query-monitor' );
85	} else if ( !constant( $constant ) ) {
86	return 'false';
87	} else {

classes/QueryMonitor.php ADDED Viewed

	@@ -0,0 +1,79 @@


1	+ <?php
2	+ /*
3	+ Copyright 2009-2016 John Blackbourn
4	+
5	+ This program is free software; you can redistribute it and/or modify
6	+ it under the terms of the GNU General Public License as published by
7	+ the Free Software Foundation; either version 2 of the License, or
8	+ (at your option) any later version.
9	+
10	+ This program is distributed in the hope that it will be useful,
11	+ but WITHOUT ANY WARRANTY; without even the implied warranty of
12	+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13	+ GNU General Public License for more details.
14	+
15	+ */
16	+
17	+ class QueryMonitor extends QM_Plugin {
18	+
19	+ protected function __construct( $file ) {
20	+
21	+ # Actions
22	+ add_action( 'plugins_loaded', array( $this, 'action_plugins_loaded' ) );
23	+ add_action( 'init', array( $this, 'action_init' ) );
24	+
25	+ # Parent setup:
26	+ parent::__construct( $file );
27	+
28	+ # Load and register built-in collectors:
29	+ foreach ( glob( $this->plugin_path( 'collectors/*.php' ) ) as $file ) {
30	+ include $file;
31	+ }
32	+
33	+ }
34	+
35	+ public function action_plugins_loaded() {
36	+
37	+ # Register additional collectors:
38	+ foreach ( apply_filters( 'qm/collectors', array(), $this ) as $collector ) {
39	+ QM_Collectors::add( $collector );
40	+ }
41	+
42	+ # Load dispatchers:
43	+ foreach ( glob( $this->plugin_path( 'dispatchers/*.php' ) ) as $file ) {
44	+ include $file;
45	+ }
46	+
47	+ # Register built-in and additional dispatchers:
48	+ foreach ( apply_filters( 'qm/dispatchers', array(), $this ) as $dispatcher ) {
49	+ QM_Dispatchers::add( $dispatcher );
50	+ }
51	+
52	+ }
53	+
54	+ public function action_init() {
55	+ load_plugin_textdomain( 'query-monitor', false, dirname( $this->plugin_base() ) . '/languages' );
56	+ }
57	+
58	+ public static function symlink_warning() {
59	+ $db = WP_CONTENT_DIR . '/db.php';
60	+ trigger_error( sprintf(
61	+ /* translators: %s: Symlink file location */
62	+ esc_html__( 'The symlink at %s is no longer pointing to the correct location. Please remove the symlink, then deactivate and reactivate Query Monitor.', 'query-monitor' ),
63	+ '<code>' . esc_html( $db ) . '</code>'
64	+ ), E_USER_WARNING );
65	+ }
66	+
67	+ public static function init( $file = null ) {
68	+
69	+ static $instance = null;
70	+
71	+ if ( ! $instance ) {
72	+ $instance = new QueryMonitor( $file );
73	+ }
74	+
75	+ return $instance;
76	+
77	+ }
78	+
79	+ }

classes/Util.php CHANGED Viewed

	@@ -108,8 +108,10 @@ class QM_Util {
108	$plug = basename( $plug );
109	}
110	if ( 'mu-plugin' === $type ) {

111	$name = sprintf( __( 'MU Plugin: %s', 'query-monitor' ), $plug );
112	} else {

113	$name = sprintf( __( 'Plugin: %s', 'query-monitor' ), $plug );
114	}
115	$context = $plug;
	@@ -124,6 +126,7 @@ class QM_Util {
124	} else {
125	$plug = basename( $plug );
126	}

127	$name = sprintf( __( 'VIP Plugin: %s', 'query-monitor' ), $plug );
128	$context = $plug;
129	break;
	@@ -180,6 +183,7 @@ class QM_Util {
180	if ( is_a( $callback['function'], 'Closure' ) ) {
181	$ref = new ReflectionFunction( $callback['function'] );
182	$file = QM_Util::standard_dir( $ref->getFileName(), '' );

183	$callback['name'] = sprintf( __( 'Closure on line %1$d of %2$s', 'query-monitor' ), $ref->getStartLine(), $file );
184	} else {
185	// the object should have a __invoke() method
	@@ -206,6 +210,7 @@ class QM_Util {
206	$callback['file'] = $matches['file'];
207	$callback['line'] = $matches['line'];
208	$file = trim( QM_Util::standard_dir( $callback['file'], '' ), '/' );

209	$callback['name'] = sprintf( __( 'Anonymous function on line %1$d of %2$s', 'query-monitor' ), $callback['line'], $file );
210	} else {
211	// https://github.com/facebook/hhvm/issues/5807


108	$plug = basename( $plug );
109	}
110	if ( 'mu-plugin' === $type ) {
111	+ /* translators: %s: Plugin name */
112	$name = sprintf( __( 'MU Plugin: %s', 'query-monitor' ), $plug );
113	} else {
114	+ /* translators: %s: Plugin name */
115	$name = sprintf( __( 'Plugin: %s', 'query-monitor' ), $plug );
116	}
117	$context = $plug;

126	} else {
127	$plug = basename( $plug );
128	}
129	+ /* translators: %s: Plugin name */
130	$name = sprintf( __( 'VIP Plugin: %s', 'query-monitor' ), $plug );
131	$context = $plug;
132	break;

183	if ( is_a( $callback['function'], 'Closure' ) ) {
184	$ref = new ReflectionFunction( $callback['function'] );
185	$file = QM_Util::standard_dir( $ref->getFileName(), '' );
186	+ /* translators: 1: Line number, 2: File name */
187	$callback['name'] = sprintf( __( 'Closure on line %1$d of %2$s', 'query-monitor' ), $ref->getStartLine(), $file );
188	} else {
189	// the object should have a __invoke() method

210	$callback['file'] = $matches['file'];
211	$callback['line'] = $matches['line'];
212	$file = trim( QM_Util::standard_dir( $callback['file'], '' ), '/' );
213	+ /* translators: 1: Line number, 2: File name */
214	$callback['name'] = sprintf( __( 'Anonymous function on line %1$d of %2$s', 'query-monitor' ), $callback['line'], $file );
215	} else {
216	// https://github.com/facebook/hhvm/issues/5807

collectors/debug_bar.php CHANGED Viewed

	@@ -25,6 +25,7 @@ final class QM_Collector_Debug_Bar extends QM_Collector {
25
26	public function name() {
27	$title = $this->get_panel()->title();

28	return sprintf( __( 'Debug Bar: %s', 'query-monitor' ), $title );
29	}
30


25
26	public function name() {
27	$title = $this->get_panel()->title();
28	+ /* translators: %s: Name of a Debug Bar panel */
29	return sprintf( __( 'Debug Bar: %s', 'query-monitor' ), $title );
30	}
31

collectors/http.php CHANGED Viewed

	@@ -133,7 +133,11 @@ class QM_Collector_HTTP extends QM_Collector {
133	$this->data['http'][$args['_qm_key']]['args'] = $args;
134	if ( isset( $args['_qm_original_key'] ) ) {
135	$this->data['http'][$args['_qm_original_key']]['end'] = $this->data['http'][$args['_qm_original_key']]['start'];
136	- $this->data['http'][$args['_qm_original_key']]['response'] = new WP_Error( 'http_request_not_executed', __( ~~'Request not executed due to a filter on pre_http_request', 'query-monitor' ) );~~




137	}
138	}
139
	@@ -179,7 +183,7 @@ class QM_Collector_HTTP extends QM_Collector {
179
180	if ( is_wp_error( $http['response'] ) ) {
181	if ( !in_array( $http['response']->get_error_code(), $silent ) ) {
182	- $this->data['errors']['~~error~~'][] = $key;
183	}
184	$http['type'] = __( 'Error', 'query-monitor' );
185	} else {


133	$this->data['http'][$args['_qm_key']]['args'] = $args;
134	if ( isset( $args['_qm_original_key'] ) ) {
135	$this->data['http'][$args['_qm_original_key']]['end'] = $this->data['http'][$args['_qm_original_key']]['start'];
136	+ $this->data['http'][$args['_qm_original_key']]['response'] = new WP_Error( 'http_request_not_executed', sprintf(
137	+ /* translators: %s: Hook name */
138	+ __( 'Request not executed due to a filter on %s', 'query-monitor' ),
139	+ 'pre_http_request'
140	+ ) );
141	}
142	}
143

183
184	if ( is_wp_error( $http['response'] ) ) {
185	if ( !in_array( $http['response']->get_error_code(), $silent ) ) {
186	+ $this->data['errors']['alert'][] = $key;
187	}
188	$http['type'] = __( 'Error', 'query-monitor' );
189	} else {

collectors/php_errors.php CHANGED Viewed

	@@ -31,6 +31,8 @@ class QM_Collector_PHP_Errors extends QM_Collector {
31
32	public $id = 'php_errors';
33	private $display_errors = null;


34
35	public function name() {
36	return __( 'PHP Errors', 'query-monitor' );
	@@ -80,6 +82,20 @@ class QM_Collector_PHP_Errors extends QM_Collector {
80	return false;
81	}
82














83	$trace = new QM_Backtrace( array(
84	'ignore_current_filter' => false,
85	) );


31
32	public $id = 'php_errors';
33	private $display_errors = null;
34	+ private static $unexpected_error;
35	+ private static $wordpress_couldnt;
36
37	public function name() {
38	return __( 'PHP Errors', 'query-monitor' );

82	return false;
83	}
84
85	+ if ( ! isset( self::$unexpected_error ) ) {
86	+ self::$unexpected_error = __( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server’s configuration. If you continue to have problems, please try the <a href="https://wordpress.org/support/">support forums</a>.' );
87	+ self::$wordpress_couldnt = __( '(WordPress could not establish a secure connection to WordPress.org. Please contact your server administrator.)' );
88	+ }
89	+
90	+ // Intentionally skip reporting these core warnings. They're a distraction when developing offline.
91	+ // The failed HTTP request will still appear in QM's output so it's not a big problem hiding these warnings.
92	+ if ( self::$unexpected_error === $message ) {
93	+ return false;
94	+ }
95	+ if ( self::$unexpected_error . ' ' . self::$wordpress_couldnt === $message ) {
96	+ return false;
97	+ }
98	+
99	$trace = new QM_Backtrace( array(
100	'ignore_current_filter' => false,
101	) );

collectors/request.php CHANGED Viewed

	@@ -94,6 +94,7 @@ class QM_Collector_Request extends QM_Collector {
94
95	case is_a( $qo, 'WP_Post' ):
96	// Single post

97	$this->data['queried_object']['title'] = sprintf( __( 'Single %s: #%d', 'query-monitor' ),
98	get_post_type_object( $qo->post_type )->labels->singular_name,
99	$qo->ID
	@@ -102,6 +103,7 @@ class QM_Collector_Request extends QM_Collector {
102
103	case is_a( $qo, 'WP_User' ):
104	// Author archive

105	$this->data['queried_object']['title'] = sprintf( __( 'Author archive: %s', 'query-monitor' ),
106	$qo->user_nicename
107	);
	@@ -110,13 +112,16 @@ class QM_Collector_Request extends QM_Collector {
110	case is_a( $qo, 'WP_Term' ):
111	case property_exists( $qo, 'term_id' ):
112	// Term archive

113	$this->data['queried_object']['title'] = sprintf( __( 'Term archive: %s', 'query-monitor' ),
114	$qo->slug
115	);
116	break;
117

118	case property_exists( $qo, 'has_archive' ):
119	// Post type archive

120	$this->data['queried_object']['title'] = sprintf( __( 'Post type archive: %s', 'query-monitor' ),
121	$qo->name
122	);


94
95	case is_a( $qo, 'WP_Post' ):
96	// Single post
97	+ /* translators: 1: Post type name, 2: Post ID */
98	$this->data['queried_object']['title'] = sprintf( __( 'Single %s: #%d', 'query-monitor' ),
99	get_post_type_object( $qo->post_type )->labels->singular_name,
100	$qo->ID

103
104	case is_a( $qo, 'WP_User' ):
105	// Author archive
106	+ /* translators: %s: Author name */
107	$this->data['queried_object']['title'] = sprintf( __( 'Author archive: %s', 'query-monitor' ),
108	$qo->user_nicename
109	);

112	case is_a( $qo, 'WP_Term' ):
113	case property_exists( $qo, 'term_id' ):
114	// Term archive
115	+ /* translators: %s: Taxonomy term name */
116	$this->data['queried_object']['title'] = sprintf( __( 'Term archive: %s', 'query-monitor' ),
117	$qo->slug
118	);
119	break;
120
121	+ case is_a( $qo, 'WP_Post_Type' ):
122	case property_exists( $qo, 'has_archive' ):
123	// Post type archive
124	+ /* translators: %s: Post type name */
125	$this->data['queried_object']['title'] = sprintf( __( 'Post type archive: %s', 'query-monitor' ),
126	$qo->name
127	);

collectors/theme.php CHANGED Viewed

	@@ -26,6 +26,7 @@ class QM_Collector_Theme extends QM_Collector {
26	parent::__construct();
27	add_filter( 'body_class', array( $this, 'filter_body_class' ), 999 );
28	add_filter( 'template_include', array( $this, 'filter_template_include' ), 999 );

29	}
30
31	public function filter_body_class( array $class ) {
	@@ -38,6 +39,14 @@ class QM_Collector_Theme extends QM_Collector {
38	return $template_path;
39	}
40








41	public function process() {
42
43	if ( ! empty( $this->data['template_path'] ) ) {


26	parent::__construct();
27	add_filter( 'body_class', array( $this, 'filter_body_class' ), 999 );
28	add_filter( 'template_include', array( $this, 'filter_template_include' ), 999 );
29	+ add_filter( 'timber/output', array( $this, 'filter_timber_output' ), 999, 3 );
30	}
31
32	public function filter_body_class( array $class ) {

39	return $template_path;
40	}
41
42	+ public function filter_timber_output( $output, $data = null, $file = null ) {
43	+ if ( $file ) {
44	+ $this->data['timber_files'][] = $file;
45	+ }
46	+
47	+ return $output;
48	+ }
49	+
50	public function process() {
51
52	if ( ! empty( $this->data['template_path'] ) ) {

output/Html.php CHANGED Viewed

	@@ -166,6 +166,10 @@ abstract class QM_Output_Html extends QM_Output {
166	*/
167	public static function output_filename( $text, $file, $line = 0 ) {
168




169	# Further reading:
170	# http://simonwheatley.co.uk/2012/07/clickable-stack-traces/
171	# https://github.com/grych/subl-handler


166	*/
167	public static function output_filename( $text, $file, $line = 0 ) {
168
169	+ if ( empty( $file ) ) {
170	+ return esc_html( $text );
171	+ }
172	+
173	# Further reading:
174	# http://simonwheatley.co.uk/2012/07/clickable-stack-traces/
175	# https://github.com/grych/subl-handler

output/headers/overview.php CHANGED Viewed

	@@ -23,6 +23,7 @@ class QM_Output_Headers_Overview extends QM_Output_Headers {
23
24	$headers['time'] = number_format_i18n( $data['time'], 4 );
25	$headers['time_usage'] = sprintf(

26	__( '%1$s%% of %2$ss limit', 'query-monitor' ),
27	number_format_i18n( $data['time_usage'], 1 ),
28	number_format_i18n( $data['time_limit'] )
	@@ -30,10 +31,12 @@ class QM_Output_Headers_Overview extends QM_Output_Headers {
30
31	if ( ! empty( $data['memory'] ) ) {
32	$headers['memory'] = sprintf(

33	__( '%s kB', 'query-monitor' ),
34	number_format_i18n( $data['memory'] / 1024 )
35	);
36	$headers['memory_usage'] = sprintf(

37	__( '%1$s%% of %2$s kB limit', 'query-monitor' ),
38	number_format_i18n( $data['memory_usage'], 1 ),
39	number_format_i18n( $data['memory_limit'] / 1024 )


23
24	$headers['time'] = number_format_i18n( $data['time'], 4 );
25	$headers['time_usage'] = sprintf(
26	+ /* translators: 1: Percentage of time limit used, 2: Time limit in seconds */
27	__( '%1$s%% of %2$ss limit', 'query-monitor' ),
28	number_format_i18n( $data['time_usage'], 1 ),
29	number_format_i18n( $data['time_limit'] )

31
32	if ( ! empty( $data['memory'] ) ) {
33	$headers['memory'] = sprintf(
34	+ /* translators: %s: Memory used in kilobytes */
35	__( '%s kB', 'query-monitor' ),
36	number_format_i18n( $data['memory'] / 1024 )
37	);
38	$headers['memory_usage'] = sprintf(
39	+ /* translators: 1: Percentage of memory limit used, 2: Memory limit in kilobytes */
40	__( '%1$s%% of %2$s kB limit', 'query-monitor' ),
41	number_format_i18n( $data['memory_usage'], 1 ),
42	number_format_i18n( $data['memory_limit'] / 1024 )

output/html/assets.php CHANGED Viewed

	@@ -33,6 +33,21 @@ class QM_Output_Html_Assets extends QM_Output_Html {
33	echo '<div class="qm" id="' . esc_attr( $this->collector->id() ) . '">';
34	echo '<table cellspacing="0">';
35















36	foreach ( array(
37	'scripts' => __( 'Scripts', 'query-monitor' ),
38	'styles' => __( 'Styles', 'query-monitor' ),
	@@ -56,14 +71,14 @@ class QM_Output_Html_Assets extends QM_Output_Html {
56	echo '<tbody>';
57
58	foreach ( array(
59	- 'missing' ~~=> __( 'Missing %s'~~, ~~'query-monitor' ),~~
60	- 'broken' ~~=> __( 'Broken Dependencies'~~, ~~'query-monitor' ),~~
61	- 'header' ~~=> __( 'Header %s'~~, ~~'query-monitor' ),~~
62	- 'footer' ~~=> __( 'Footer %s'~~, ~~'query-monitor' ),~~
63	- ) as $position ~~=> $position_label~~ ) {
64
65	if ( isset( $data[ $position ][ $type ] ) ) {
66	- $this->dependency_rows( $data[ $position ][ $type ], $data['raw'][ $type ], ~~sprintf(~~ $~~position_label,~~ $~~type_label~~ ), $type );
67	}
68
69	}
	@@ -143,6 +158,7 @@ class QM_Output_Html_Assets extends QM_Output_Html {
143
144	foreach ( $deps as & $dep ) {
145	if ( ! $dependencies->query( $dep ) ) {

146	$dep = sprintf( __( '%s (missing)', 'query-monitor' ), $dep );
147	}
148	}


33	echo '<div class="qm" id="' . esc_attr( $this->collector->id() ) . '">';
34	echo '<table cellspacing="0">';
35
36	+ $position_labels = array(
37	+ 'scripts' => array(
38	+ 'missing' => __( 'Missing Scripts', 'query-monitor' ),
39	+ 'broken' => __( 'Broken Dependencies', 'query-monitor' ),
40	+ 'header' => __( 'Header Scripts', 'query-monitor' ),
41	+ 'footer' => __( 'Footer Scripts', 'query-monitor' ),
42	+ ),
43	+ 'styles' => array(
44	+ 'missing' => __( 'Missing Styles', 'query-monitor' ),
45	+ 'broken' => __( 'Broken Dependencies', 'query-monitor' ),
46	+ 'header' => __( 'Header Styles', 'query-monitor' ),
47	+ 'footer' => __( 'Footer Styles', 'query-monitor' ),
48	+ ),
49	+ );
50	+
51	foreach ( array(
52	'scripts' => __( 'Scripts', 'query-monitor' ),
53	'styles' => __( 'Styles', 'query-monitor' ),

71	echo '<tbody>';
72
73	foreach ( array(
74	+ 'missing',
75	+ 'broken',
76	+ 'header',
77	+ 'footer',
78	+ ) as $position ) {
79
80	if ( isset( $data[ $position ][ $type ] ) ) {
81	+ $this->dependency_rows( $data[ $position ][ $type ], $data['raw'][ $type ], $position_labels[ $type ][ $position ], $type );
82	}
83
84	}

158
159	foreach ( $deps as & $dep ) {
160	if ( ! $dependencies->query( $dep ) ) {
161	+ /* translators: %s: Script or style dependency name */
162	$dep = sprintf( __( '%s (missing)', 'query-monitor' ), $dep );
163	}
164	}

output/html/db_callers.php CHANGED Viewed

	@@ -39,7 +39,7 @@ class QM_Output_Html_DB_Callers extends QM_Output_Html {
39	echo '<th colspan="' . absint( $span ) . '">' . esc_html( $this->collector->name() ) . '</th>';
40	echo '</tr>';
41	echo '<tr>';
42	- echo '<th>' . ~~esc_html_x~~( 'Caller', '~~Query caller', '~~query-monitor' ) . '</th>';
43
44	foreach ( $data['types'] as $type_name => $type_count ) {
45	echo '<th class="qm-num">';


39	echo '<th colspan="' . absint( $span ) . '">' . esc_html( $this->collector->name() ) . '</th>';
40	echo '</tr>';
41	echo '<tr>';
42	+ echo '<th>' . esc_html__( 'Caller', 'query-monitor' ) . '</th>';
43
44	foreach ( $data['types'] as $type_name => $type_count ) {
45	echo '<th class="qm-num">';

output/html/db_components.php CHANGED Viewed

	@@ -40,7 +40,7 @@ class QM_Output_Html_DB_Components extends QM_Output_Html {
40	echo '<th colspan="' . esc_attr( $span ) . '">' . esc_html( $this->collector->name() ) . '</th>';
41	echo '</tr>';
42	echo '<tr>';
43	- echo '<th>' . ~~esc_html_x~~( 'Component', '~~Query component', '~~query-monitor' ) . '</th>';
44
45	foreach ( $data['types'] as $type_name => $type_count ) {
46	echo '<th class="qm-num">';


40	echo '<th colspan="' . esc_attr( $span ) . '">' . esc_html( $this->collector->name() ) . '</th>';
41	echo '</tr>';
42	echo '<tr>';
43	+ echo '<th>' . esc_html__( 'Component', 'query-monitor' ) . '</th>';
44
45	foreach ( $data['types'] as $type_name => $type_count ) {
46	echo '<th class="qm-num">';

output/html/db_dupes.php CHANGED Viewed

	@@ -52,6 +52,9 @@ class QM_Output_Html_DB_Dupes extends QM_Output_Html {
52
53	echo '<tbody>';
54



55	foreach ( $data['dupes'] as $sql => $queries ) {
56
57	// This should probably happen in the collector's processor
	@@ -76,7 +79,7 @@ class QM_Output_Html_DB_Dupes extends QM_Output_Html {
76	esc_attr( $caller ),
77	esc_html( $caller ),
78	esc_html( sprintf(
79	- _n( ~~'%s call'~~, ~~'%s calls',~~ $calls, 'query-monitor' ),
80	number_format_i18n( $calls )
81	) )
82	);
	@@ -89,7 +92,7 @@ class QM_Output_Html_DB_Dupes extends QM_Output_Html {
89	'%s<br><span class="qm-info"> %s</span><br>',
90	esc_html( $component ),
91	esc_html( sprintf(
92	- _n( ~~'%s call'~~, ~~'%s calls',~~ $calls, 'query-monitor' ),
93	number_format_i18n( $calls )
94	) )
95	);
	@@ -102,7 +105,7 @@ class QM_Output_Html_DB_Dupes extends QM_Output_Html {
102	'%s<br><span class="qm-info"> %s</span><br>',
103	esc_html( $source ),
104	esc_html( sprintf(
105	- _n( ~~'%s call'~~, ~~'%s calls',~~ $calls, 'query-monitor' ),
106	number_format_i18n( $calls )
107	) )
108	);
	@@ -124,6 +127,7 @@ class QM_Output_Html_DB_Dupes extends QM_Output_Html {
124	if ( isset( $dbq_data['dupes'] ) && count( $dbq_data['dupes'] ) ) {
125	$menu[] = $this->menu( array(
126	'title' => esc_html( sprintf(

127	__( 'Duplicate Queries (%s)', 'query-monitor' ),
128	count( $dbq_data['dupes'] )
129	) ),


52
53	echo '<tbody>';
54
55	+ /* translators: %s: Number of calls to a PHP function */
56	+ $call_text = _n_noop( '%s call', '%s calls', 'query-monitor' );
57	+
58	foreach ( $data['dupes'] as $sql => $queries ) {
59
60	// This should probably happen in the collector's processor

79	esc_attr( $caller ),
80	esc_html( $caller ),
81	esc_html( sprintf(
82	+ translate_nooped_plural( $call_text, $calls, 'query-monitor' ),
83	number_format_i18n( $calls )
84	) )
85	);

92	'%s<br><span class="qm-info"> %s</span><br>',
93	esc_html( $component ),
94	esc_html( sprintf(
95	+ translate_nooped_plural( $call_text, $calls, 'query-monitor' ),
96	number_format_i18n( $calls )
97	) )
98	);

105	'%s<br><span class="qm-info"> %s</span><br>',
106	esc_html( $source ),
107	esc_html( sprintf(
108	+ translate_nooped_plural( $call_text, $calls, 'query-monitor' ),
109	number_format_i18n( $calls )
110	) )
111	);

127	if ( isset( $dbq_data['dupes'] ) && count( $dbq_data['dupes'] ) ) {
128	$menu[] = $this->menu( array(
129	'title' => esc_html( sprintf(
130	+ /* translators: %s: Number of duplicate database queries */
131	__( 'Duplicate Queries (%s)', 'query-monitor' ),
132	count( $dbq_data['dupes'] )
133	) ),

output/html/db_queries.php CHANGED Viewed

	@@ -60,6 +60,7 @@ class QM_Output_Html_DB_Queries extends QM_Output_Html {
60	echo '<tbody>';
61	echo '<tr>';
62	echo '<td class="qm-warn">';

63	printf( esc_html__( 'No database queries were logged because the %s constant is set to %s', 'query-monitor' ),
64	'<code>SAVEQUERIES</code>',
65	'<code>false</code>'
	@@ -108,6 +109,7 @@ class QM_Output_Html_DB_Queries extends QM_Output_Html {
108	echo '<thead>';
109	echo '<tr>';
110	echo '<th colspan="5" class="qm-expensive">';

111	printf( esc_html__( 'Slow Database Queries (above %ss)', 'query-monitor' ),
112	'<span class="qm-expensive">' . esc_html( number_format_i18n( QM_DB_EXPENSIVE, $dp ) ) . '</span>'
113	);
	@@ -155,6 +157,7 @@ class QM_Output_Html_DB_Queries extends QM_Output_Html {
155	echo '<table cellspacing="0" class="qm-sortable">';
156	echo '<thead>';
157	echo '<tr>';

158	echo '<th colspan="' . absint( $span ) . '">' . esc_html( sprintf( __( '%s Queries', 'query-monitor' ), $name ) ) . '</th>';
159	echo '</tr>';
160
	@@ -172,6 +175,7 @@ class QM_Output_Html_DB_Queries extends QM_Output_Html {
172	echo '<tr>';
173	echo '<td colspan="' . absint( $span ) . '" class="qm-warn">';
174	echo wp_kses( sprintf(

175	__( 'Extended query information such as the component and affected rows is not available. Query Monitor was unable to symlink its %1$s file into place. <a href="%2$s" target="_blank">See this wiki page for more information.</a>', 'query-monitor' ),
176	'<code>db.php</code>',
177	'https://github.com/johnbillion/query-monitor/wiki/db.php-Symlink'
	@@ -243,6 +247,7 @@ class QM_Output_Html_DB_Queries extends QM_Output_Html {
243	echo '<tr class="qm-items-shown qm-hide">';
244	echo '<td colspan="' . absint( $span - 1 ) . '">';
245	printf(

246	esc_html__( 'Queries in filter: %s', 'query-monitor' ),
247	'<span class="qm-items-number">' . esc_html( number_format_i18n( $db->total_qs ) ) . '</span>'
248	);
	@@ -253,6 +258,7 @@ class QM_Output_Html_DB_Queries extends QM_Output_Html {
253	echo '<tr>';
254	echo '<td colspan="' . absint( $span - 1 ) . '">';
255	echo esc_html( sprintf(

256	__( 'Total Queries: %s', 'query-monitor' ),
257	number_format_i18n( $db->total_qs )
258	) );
	@@ -409,12 +415,14 @@ class QM_Output_Html_DB_Queries extends QM_Output_Html {
409	if ( isset( $data['dbs'] ) ) {
410	foreach ( $data['dbs'] as $key => $db ) {
411	$title[] = sprintf(
412	- ~~_x(~~ '%s~~%s<small>S</small>',~~ ~~'database~~ query time', ~~'query-monitor'~~ ),

413	( count( $data['dbs'] ) > 1 ? '•   ' : '' ),
414	number_format_i18n( $db->total_time, 4 )
415	);
416	$title[] = sprintf(
417	- ~~_x(~~ '%s~~<small>Q</small>',~~ ~~'database~~ ~~query~~ ~~number',~~ ~~'query-monitor'~~ ),

418	number_format_i18n( $db->total_qs )
419	);
420	}
	@@ -443,6 +451,7 @@ class QM_Output_Html_DB_Queries extends QM_Output_Html {
443	'id' => 'query-monitor-errors',
444	'href' => '#qm-query-errors',
445	'title' => esc_html( sprintf(

446	__( 'Database Errors (%s)', 'query-monitor' ),
447	number_format_i18n( count( $errors ) )
448	) ),
	@@ -453,6 +462,7 @@ class QM_Output_Html_DB_Queries extends QM_Output_Html {
453	'id' => 'query-monitor-expensive',
454	'href' => '#qm-query-expensive',
455	'title' => esc_html( sprintf(

456	__( 'Slow Queries (%s)', 'query-monitor' ),
457	number_format_i18n( count( $expensive ) )
458	) ),
	@@ -464,6 +474,7 @@ class QM_Output_Html_DB_Queries extends QM_Output_Html {
464	$menu[] = $this->menu( array(
465	'id' => esc_attr( sprintf( 'query-monitor-%s-db-%s', $this->collector->id(), sanitize_title_with_dashes( $name ) ) ),
466	'title' => esc_html( sprintf(

467	__( 'Queries - %s', 'query-monitor' ),
468	$name
469	) ),


60	echo '<tbody>';
61	echo '<tr>';
62	echo '<td class="qm-warn">';
63	+ /* translators: 1: Name of PHP constant, 2: Value of PHP constant */
64	printf( esc_html__( 'No database queries were logged because the %s constant is set to %s', 'query-monitor' ),
65	'<code>SAVEQUERIES</code>',
66	'<code>false</code>'

109	echo '<thead>';
110	echo '<tr>';
111	echo '<th colspan="5" class="qm-expensive">';
112	+ /* translators: %s: Database query time in seconds */
113	printf( esc_html__( 'Slow Database Queries (above %ss)', 'query-monitor' ),
114	'<span class="qm-expensive">' . esc_html( number_format_i18n( QM_DB_EXPENSIVE, $dp ) ) . '</span>'
115	);

157	echo '<table cellspacing="0" class="qm-sortable">';
158	echo '<thead>';
159	echo '<tr>';
160	+ /* translators: %s: Name of database controller */
161	echo '<th colspan="' . absint( $span ) . '">' . esc_html( sprintf( __( '%s Queries', 'query-monitor' ), $name ) ) . '</th>';
162	echo '</tr>';
163

175	echo '<tr>';
176	echo '<td colspan="' . absint( $span ) . '" class="qm-warn">';
177	echo wp_kses( sprintf(
178	+ /* translators: 1: Symlink file name, 2: URL to wiki page */
179	__( 'Extended query information such as the component and affected rows is not available. Query Monitor was unable to symlink its %1$s file into place. <a href="%2$s" target="_blank">See this wiki page for more information.</a>', 'query-monitor' ),
180	'<code>db.php</code>',
181	'https://github.com/johnbillion/query-monitor/wiki/db.php-Symlink'

247	echo '<tr class="qm-items-shown qm-hide">';
248	echo '<td colspan="' . absint( $span - 1 ) . '">';
249	printf(
250	+ /* translators: %s: Number of database queries in the current filtered view */
251	esc_html__( 'Queries in filter: %s', 'query-monitor' ),
252	'<span class="qm-items-number">' . esc_html( number_format_i18n( $db->total_qs ) ) . '</span>'
253	);

258	echo '<tr>';
259	echo '<td colspan="' . absint( $span - 1 ) . '">';
260	echo esc_html( sprintf(
261	+ /* translators: %s: Number of database queries */
262	__( 'Total Queries: %s', 'query-monitor' ),
263	number_format_i18n( $db->total_qs )
264	) );

415	if ( isset( $data['dbs'] ) ) {
416	foreach ( $data['dbs'] as $key => $db ) {
417	$title[] = sprintf(
418	+ /* translators: %s: Database query time in seconds */
419	+ '%s' . _x( '%s<small>S</small>', 'Query time', 'query-monitor' ),
420	( count( $data['dbs'] ) > 1 ? '•   ' : '' ),
421	number_format_i18n( $db->total_time, 4 )
422	);
423	$title[] = sprintf(
424	+ /* translators: %s: Number of database queries */
425	+ _x( '%s<small>Q</small>', 'Query count', 'query-monitor' ),
426	number_format_i18n( $db->total_qs )
427	);
428	}

451	'id' => 'query-monitor-errors',
452	'href' => '#qm-query-errors',
453	'title' => esc_html( sprintf(
454	+ /* translators: %s: Number of database errors */
455	__( 'Database Errors (%s)', 'query-monitor' ),
456	number_format_i18n( count( $errors ) )
457	) ),

462	'id' => 'query-monitor-expensive',
463	'href' => '#qm-query-expensive',
464	'title' => esc_html( sprintf(
465	+ /* translators: %s: Number of slow database queries */
466	__( 'Slow Queries (%s)', 'query-monitor' ),
467	number_format_i18n( count( $expensive ) )
468	) ),

474	$menu[] = $this->menu( array(
475	'id' => esc_attr( sprintf( 'query-monitor-%s-db-%s', $this->collector->id(), sanitize_title_with_dashes( $name ) ) ),
476	'title' => esc_html( sprintf(
477	+ /* translators: %s: Name of database controller */
478	__( 'Queries - %s', 'query-monitor' ),
479	$name
480	) ),

output/html/environment.php CHANGED Viewed

	@@ -73,6 +73,7 @@ class QM_Output_Html_Environment extends QM_Output_Html {
73	printf(
74	'<br><span class="qm-info"> %s</span>',
75	esc_html( sprintf(

76	__( 'Overridden at runtime from %s', 'query-monitor' ),
77	$val['before']
78	) )
	@@ -103,6 +104,7 @@ class QM_Output_Html_Environment extends QM_Output_Html {
103	if ( 1 === count( $data['db'] ) ) {
104	$name = __( 'Database', 'query-monitor' );
105	} else {

106	$name = sprintf( __( 'Database: %s', 'query-monitor' ), $id );
107	}
108
	@@ -133,6 +135,7 @@ class QM_Output_Html_Environment extends QM_Output_Html {
133	echo '<tr>';
134
135	$first = true;

136	$search = __( 'https://www.google.com/search?q=mysql+performance+%s', 'query-monitor' );
137
138	foreach ( $db['variables'] as $setting ) {
	@@ -151,7 +154,7 @@ class QM_Output_Html_Environment extends QM_Output_Html {
151	if ( $show_warning ) {
152	$append .= sprintf(
153	' <span class="qm-info">(<a href="%s" target="_blank">%s</a>)</span>',
154	- esc_url( sprintf( $search, $key ) ),
155	esc_html__( 'Help', 'query-monitor' )
156	);
157	}


73	printf(
74	'<br><span class="qm-info"> %s</span>',
75	esc_html( sprintf(
76	+ /* translators: %s: Original value of a variable */
77	__( 'Overridden at runtime from %s', 'query-monitor' ),
78	$val['before']
79	) )

104	if ( 1 === count( $data['db'] ) ) {
105	$name = __( 'Database', 'query-monitor' );
106	} else {
107	+ /* translators: %s: Name of database controller */
108	$name = sprintf( __( 'Database: %s', 'query-monitor' ), $id );
109	}
110

135	echo '<tr>';
136
137	$first = true;
138	+ /* translators: %s: Search term */
139	$search = __( 'https://www.google.com/search?q=mysql+performance+%s', 'query-monitor' );
140
141	foreach ( $db['variables'] as $setting ) {

154	if ( $show_warning ) {
155	$append .= sprintf(
156	' <span class="qm-info">(<a href="%s" target="_blank">%s</a>)</span>',
157	+ esc_url( sprintf( $search, urlencode( $key ) ) ),
158	esc_html__( 'Help', 'query-monitor' )
159	);
160	}

output/html/hooks.php CHANGED Viewed

	@@ -108,6 +108,7 @@ class QM_Output_Html_Hooks extends QM_Output_Html {
108	if ( 'all' === $hook['name'] ) {
109	echo '<br><span class="qm-warn">';
110	printf(

111	esc_html__( 'Warning: The %s action is extremely resource intensive. Try to avoid using it.', 'query-monitor' ),
112	'<code>all</code>'
113	);
	@@ -129,6 +130,7 @@ class QM_Output_Html_Hooks extends QM_Output_Html {
129	if ( isset( $action['callback']['error'] ) ) {
130	echo '<br><span class="qm-warn">';
131	echo esc_html( sprintf(

132	__( 'Error: %s', 'query-monitor' ),
133	$action['callback']['error']->get_error_message()
134	) );


108	if ( 'all' === $hook['name'] ) {
109	echo '<br><span class="qm-warn">';
110	printf(
111	+ /* translators: %s: Action name */
112	esc_html__( 'Warning: The %s action is extremely resource intensive. Try to avoid using it.', 'query-monitor' ),
113	'<code>all</code>'
114	);

130	if ( isset( $action['callback']['error'] ) ) {
131	echo '<br><span class="qm-warn">';
132	echo esc_html( sprintf(
133	+ /* translators: %s: Error message text */
134	__( 'Error: %s', 'query-monitor' ),
135	$action['callback']['error']->get_error_message()
136	) );

output/html/http.php CHANGED Viewed

	@@ -76,33 +76,31 @@ class QM_Output_Html_HTTP extends QM_Output_Html {
76	$response = $row['response']->get_error_message();
77	$css = 'qm-warn';
78	} else {
79	- $~~response~~ = wp_remote_retrieve_response_code( $row['response'] );
80	$msg = wp_remote_retrieve_response_message( $row['response'] );
81	$css = '';
82
83	- if ( ~~empty~~( $~~response~~ ) ) {
84	- $response = __( 'n/a', 'query-monitor' );
85	- } else {
86	- $response = $response . ' ' . $msg;
87	- }
88	-
89	- if ( intval( $response ) >= 400 ) {
90	$css = 'qm-warn';
91	}
92


93	}
94
95	$method = esc_html( $row['args']['method'] );
96
97	if ( empty( $row['args']['blocking'] ) ) {
98	$method .= '<br><span class="qm-info">' . esc_html( sprintf(
99	- ~~_x(~~ ~~'(Non~~-blocking request: %s~~)',~~ ~~'non-blocking~~ ~~HTTP~~ ~~transport',~~ ~~'query-monitor' ),~~

100	'blocking=false'
101	) ) . '</span>';
102	}
103
104	if ( empty( $row['args']['sslverify'] ) && empty( $row['args']['local'] ) && 'https' === parse_url( $row['url'], PHP_URL_SCHEME ) ) {
105	$method .= '<br><span class="qm-warn">' . esc_html( sprintf(

106	__( '(Certificate verification disabled: %s)', 'query-monitor' ),
107	'sslverify=false'
108	) ) . '</span>';
	@@ -223,8 +221,8 @@ class QM_Output_Html_HTTP extends QM_Output_Html {
223
224	$data = $this->collector->get_data();
225
226	- if ( isset( $data['errors']['~~error~~'] ) ) {
227	- $class[] = 'qm-~~error~~';
228	} else if ( isset( $data['errors']['warning'] ) ) {
229	$class[] = 'qm-warning';
230	}
	@@ -241,6 +239,7 @@ class QM_Output_Html_HTTP extends QM_Output_Html {
241
242	$title = ( empty( $count ) )
243	? __( 'HTTP Requests', 'query-monitor' )

244	: __( 'HTTP Requests (%s)', 'query-monitor' );
245
246	$args = array(
	@@ -250,8 +249,8 @@ class QM_Output_Html_HTTP extends QM_Output_Html {
250	) ),
251	);
252
253	- if ( isset( $data['errors']['~~error~~'] ) ) {
254	- $args['meta']['classname'] = 'qm-~~error~~';
255	} else if ( isset( $data['errors']['warning'] ) ) {
256	$args['meta']['classname'] = 'qm-warning';
257	}


76	$response = $row['response']->get_error_message();
77	$css = 'qm-warn';
78	} else {
79	+ $code = wp_remote_retrieve_response_code( $row['response'] );
80	$msg = wp_remote_retrieve_response_message( $row['response'] );
81	$css = '';
82
83	+ if ( intval( $code ) >= 400 ) {






84	$css = 'qm-warn';
85	}
86
87	+ $response = $code . ' ' . $msg;
88	+
89	}
90
91	$method = esc_html( $row['args']['method'] );
92
93	if ( empty( $row['args']['blocking'] ) ) {
94	$method .= '<br><span class="qm-info">' . esc_html( sprintf(
95	+ /* translators: A non-blocking HTTP API request. %s: Relevant argument name */
96	+ __( '(Non-blocking request: %s)', 'query-monitor' ),
97	'blocking=false'
98	) ) . '</span>';
99	}
100
101	if ( empty( $row['args']['sslverify'] ) && empty( $row['args']['local'] ) && 'https' === parse_url( $row['url'], PHP_URL_SCHEME ) ) {
102	$method .= '<br><span class="qm-warn">' . esc_html( sprintf(
103	+ /* translators: An HTTP API request has disabled certificate verification. %s: Relevant argument name */
104	__( '(Certificate verification disabled: %s)', 'query-monitor' ),
105	'sslverify=false'
106	) ) . '</span>';

221
222	$data = $this->collector->get_data();
223
224	+ if ( isset( $data['errors']['alert'] ) ) {
225	+ $class[] = 'qm-alert';
226	} else if ( isset( $data['errors']['warning'] ) ) {
227	$class[] = 'qm-warning';
228	}

239
240	$title = ( empty( $count ) )
241	? __( 'HTTP Requests', 'query-monitor' )
242	+ /* translators: %s: Number of HTTP requests */
243	: __( 'HTTP Requests (%s)', 'query-monitor' );
244
245	$args = array(

249	) ),
250	);
251
252	+ if ( isset( $data['errors']['alert'] ) ) {
253	+ $args['meta']['classname'] = 'qm-alert';
254	} else if ( isset( $data['errors']['warning'] ) ) {
255	$args['meta']['classname'] = 'qm-warning';
256	}

output/html/languages.php CHANGED Viewed

	@@ -35,7 +35,11 @@ class QM_Output_Html_Languages extends QM_Output_Html {
35	echo '<table cellspacing="0">';
36	echo '<thead>';
37	echo '<tr>';
38	- echo '<th colspan="4">' . ~~esc_html__~~( ~~'Language Setting:', 'query-monitor' ) . ' ' . esc_html~~( ~~$data['locale'] ) . '</th>';~~




39	echo '</tr>';
40	echo '<tr>';
41	echo '<td>' . esc_html__( 'Text Domain', 'query-monitor' ) . '</td>';


35	echo '<table cellspacing="0">';
36	echo '<thead>';
37	echo '<tr>';
38	+ echo '<th colspan="4">' . esc_html( sprintf(
39	+ /* translators: %s: Name of current language */
40	+ __( 'Language Setting: %s', 'query-monitor' ),
41	+ $data['locale']
42	+ ) ) . '</th>';
43	echo '</tr>';
44	echo '<tr>';
45	echo '<td>' . esc_html__( 'Text Domain', 'query-monitor' ) . '</td>';

output/html/overview.php CHANGED Viewed

	@@ -116,6 +116,7 @@ class QM_Output_Html_Overview extends QM_Output_Html {
116	number_format_i18n( $cache_hit_percentage, 1 )
117	) );
118	echo '<br>' . esc_html( sprintf(

119	__( 'External object cache: %s'),
120	( $cache_data['ext_object_cache'] ? 'true' : 'false' )
121	) );
	@@ -141,11 +142,13 @@ class QM_Output_Html_Overview extends QM_Output_Html {
141	}
142
143	$title[] = sprintf(
144	- ~~_x(~~ '%s~~<small>S</small>',~~ ~~'page~~ load time', ~~'query-monitor'~~ ),

145	number_format_i18n( $data['time'], 2 )
146	);
147	$title[] = sprintf(
148	- ~~_x(~~ '%s~~<small>MB</small>',~~ ~~'memory~~ usage', ~~'query-monitor'~~ ),

149	$memory
150	);
151	return $title;


116	number_format_i18n( $cache_hit_percentage, 1 )
117	) );
118	echo '<br>' . esc_html( sprintf(
119	+ /* translators: %s: External object cache status */
120	__( 'External object cache: %s'),
121	( $cache_data['ext_object_cache'] ? 'true' : 'false' )
122	) );

142	}
143
144	$title[] = sprintf(
145	+ /* translators: %s: Page load time in seconds */
146	+ _x( '%s<small>S</small>', 'Page load time', 'query-monitor' ),
147	number_format_i18n( $data['time'], 2 )
148	);
149	$title[] = sprintf(
150	+ /* translators: %s: Memory usage in megabytes */
151	+ _x( '%s<small>MB</small>', 'Memory usage', 'query-monitor' ),
152	$memory
153	);
154	return $title;

output/html/php_errors.php CHANGED Viewed

	@@ -44,10 +44,10 @@ class QM_Output_Html_PHP_Errors extends QM_Output_Html {
44	echo '<tbody>';
45
46	$types = array(
47	- 'warning' => __( 'Warning', 'query-monitor' ),
48	- 'notice' => __( 'Notice', 'query-monitor' ),
49	- 'strict' => __( 'Strict', 'query-monitor' ),
50	- 'deprecated' => __( 'Deprecated', 'query-monitor' ),
51	);
52
53	foreach ( $types as $type => $title ) {
	@@ -142,6 +142,7 @@ class QM_Output_Html_PHP_Errors extends QM_Output_Html {
142	$menu[] = $this->menu( array(
143	'id' => 'query-monitor-warnings',
144	'title' => esc_html( sprintf(

145	__( 'PHP Warnings (%s)', 'query-monitor' ),
146	number_format_i18n( count( $data['errors']['warning'] ) )
147	) )
	@@ -151,6 +152,7 @@ class QM_Output_Html_PHP_Errors extends QM_Output_Html {
151	$menu[] = $this->menu( array(
152	'id' => 'query-monitor-notices',
153	'title' => esc_html( sprintf(

154	__( 'PHP Notices (%s)', 'query-monitor' ),
155	number_format_i18n( count( $data['errors']['notice'] ) )
156	) )
	@@ -160,6 +162,7 @@ class QM_Output_Html_PHP_Errors extends QM_Output_Html {
160	$menu[] = $this->menu( array(
161	'id' => 'query-monitor-stricts',
162	'title' => esc_html( sprintf(

163	__( 'PHP Stricts (%s)', 'query-monitor' ),
164	number_format_i18n( count( $data['errors']['strict'] ) )
165	) )
	@@ -169,6 +172,7 @@ class QM_Output_Html_PHP_Errors extends QM_Output_Html {
169	$menu[] = $this->menu( array(
170	'id' => 'query-monitor-deprecated',
171	'title' => esc_html( sprintf(

172	__( 'PHP Deprecated (%s)', 'query-monitor' ),
173	number_format_i18n( count( $data['errors']['deprecated'] ) )
174	) )


44	echo '<tbody>';
45
46	$types = array(
47	+ 'warning' => _x( 'Warning', 'PHP error level', 'query-monitor' ),
48	+ 'notice' => _x( 'Notice', 'PHP error level', 'query-monitor' ),
49	+ 'strict' => _x( 'Strict', 'PHP error level', 'query-monitor' ),
50	+ 'deprecated' => _x( 'Deprecated', 'PHP error level', 'query-monitor' ),
51	);
52
53	foreach ( $types as $type => $title ) {

142	$menu[] = $this->menu( array(
143	'id' => 'query-monitor-warnings',
144	'title' => esc_html( sprintf(
145	+ /* translators: %s: Number of PHP warnings */
146	__( 'PHP Warnings (%s)', 'query-monitor' ),
147	number_format_i18n( count( $data['errors']['warning'] ) )
148	) )

152	$menu[] = $this->menu( array(
153	'id' => 'query-monitor-notices',
154	'title' => esc_html( sprintf(
155	+ /* translators: %s: Number of PHP notices */
156	__( 'PHP Notices (%s)', 'query-monitor' ),
157	number_format_i18n( count( $data['errors']['notice'] ) )
158	) )

162	$menu[] = $this->menu( array(
163	'id' => 'query-monitor-stricts',
164	'title' => esc_html( sprintf(
165	+ /* translators: %s: Number of strict PHP errors */
166	__( 'PHP Stricts (%s)', 'query-monitor' ),
167	number_format_i18n( count( $data['errors']['strict'] ) )
168	) )

172	$menu[] = $this->menu( array(
173	'id' => 'query-monitor-deprecated',
174	'title' => esc_html( sprintf(
175	+ /* translators: %s: Number of deprecated PHP errors */
176	__( 'PHP Deprecated (%s)', 'query-monitor' ),
177	number_format_i18n( count( $data['errors']['deprecated'] ) )
178	) )

output/html/request.php CHANGED Viewed

	@@ -165,6 +165,7 @@ class QM_Output_Html_Request extends QM_Output_Html {
165
166	$title = ( empty( $count ) )
167	? __( 'Request', 'query-monitor' )

168	: __( 'Request (+%s)', 'query-monitor' );
169
170	$menu[] = $this->menu( array(


165
166	$title = ( empty( $count ) )
167	? __( 'Request', 'query-monitor' )
168	+ /* translators: %s: Number of additional query variables */
169	: __( 'Request (+%s)', 'query-monitor' );
170
171	$menu[] = $this->menu( array(

output/html/theme.php CHANGED Viewed

@@ -81,6 +81,27 @@ class QM_Output_Html_Theme extends QM_Output_Html {
             			echo '</tr>';
+            		}
             		echo '<tr>';
             		if ( $data['is_child_theme'] ) {
@@ -132,6 +153,7 @@ class QM_Output_Html_Theme extends QM_Output_Html {
             		if ( isset( $data['template_file'] ) ) {
             			$menu[] = $this->menu( array(
             				'title' => esc_html( sprintf(
             					__( 'Template: %s', 'query-monitor' ),
             					( $data['is_child_theme'] ? $data['theme_template_file'] : $data['template_file'] )
             				) ),


81	echo '</tr>';
82	}
83
84	+ if ( ! empty( $data['timber_files'] ) ) {
85	+
86	+ $count = count( $data['timber_files'] );
87	+ echo '<tr>';
88	+ echo '<td rowspan="' . absint( $count ) . '">' . esc_html__( 'Timber Files', 'query-monitor' ) . '</td>';
89	+ $first = true;
90	+
91	+ foreach ( $data['timber_files'] as $filename ) {
92	+
93	+ if ( ! $first ) {
94	+ echo '<tr>';
95	+ }
96	+
97	+ echo '<td>' . esc_html( $filename ) . '</td>';
98	+ echo '</tr>';
99	+
100	+ $first = false;
101	+
102	+ }
103	+
104	+ }
105
106	echo '<tr>';
107	if ( $data['is_child_theme'] ) {

153	if ( isset( $data['template_file'] ) ) {
154	$menu[] = $this->menu( array(
155	'title' => esc_html( sprintf(
156	+ /* translators: %s: Template file name */
157	__( 'Template: %s', 'query-monitor' ),
158	( $data['is_child_theme'] ? $data['theme_template_file'] : $data['template_file'] )
159	) ),

output/html/transients.php CHANGED Viewed

	@@ -124,6 +124,7 @@ class QM_Output_Html_Transients extends QM_Output_Html {
124
125	$title = ( empty( $count ) )
126	? __( 'Transients Set', 'query-monitor' )

127	: __( 'Transients Set (%s)', 'query-monitor' );
128
129	$menu[] = $this->menu( array(


124
125	$title = ( empty( $count ) )
126	? __( 'Transients Set', 'query-monitor' )
127	+ /* translators: %s: Number of transient values that were set */
128	: __( 'Transients Set (%s)', 'query-monitor' );
129
130	$menu[] = $this->menu( array(

query-monitor.php CHANGED Viewed

@@ -2,8 +2,8 @@
             /*
             Plugin Name: Query Monitor
             Description: Monitoring of database queries, hooks, conditionals and more.
-            -
            Version:     2.11.1
-            -
            Plugin URI:  https://github.com/johnbillion/querymonitor
             Author:      John Blackbourn
             Author URI:  https://johnblackbourn.com/
             Text Domain: query-monitor
@@ -26,6 +26,15 @@ GNU General Public License for more details.
             defined( 'ABSPATH' ) or die();
             if ( defined( 'QM_DISABLED' ) and QM_DISABLED ) {
             	return;
+            }
@@ -41,151 +50,8 @@ if ( defined( 'DOING_CRON' ) && DOING_CRON ) {
             	return;
+            }
-            -
            # No autoloaders for us. See https://github.com/johnbillion/QueryMonitor/issues/7
-            -
            $qm_dir = dirname( __FILE__ );
-            -
            foreach ( array( 'Backtrace', 'Collectors', 'Collector', 'Plugin', 'Util', 'Dispatchers', 'Dispatcher', 'Output' ) as $qm_class ) {
             	require_once "{$qm_dir}/classes/{$qm_class}.php";
+            }
-            -
            class QueryMonitor extends QM_Plugin {
-            -
-            -
            	protected function __construct( $file ) {
-            -
-            -
            		# Actions
-            -
            		add_action( 'plugins_loaded', array( $this, 'action_plugins_loaded' ) );
-            -
            		add_action( 'init',           array( $this, 'action_init' ) );
-            -
-            -
            		# Filters
-            -
            		add_filter( 'pre_update_option_active_plugins',               array( $this, 'filter_active_plugins' ) );
-            -
            		add_filter( 'pre_update_site_option_active_sitewide_plugins', array( $this, 'filter_active_sitewide_plugins' ) );
-            -
-            -
            		# [Dea|A]ctivation
-            -
            		register_activation_hook(   __FILE__, array( $this, 'activate' ) );
-            -
            		register_deactivation_hook( __FILE__, array( $this, 'deactivate' ) );
-            -
-            -
            		# Parent setup:
-            -
            		parent::__construct( $file );
-            -
-            -
            		# Load and register built-in collectors:
-            -
            		foreach ( glob( $this->plugin_path( 'collectors/*.php' ) ) as $file ) {
-            -
            			include $file;
-            -
            		}
-            -
-            -
            	}
-            -
-            -
            	public function action_plugins_loaded() {
-            -
-            -
            		# Register additional collectors:
-            -
            		foreach ( apply_filters( 'qm/collectors', array(), $this ) as $collector ) {
-            -
            			QM_Collectors::add( $collector );
-            -
            		}
-            -
-            -
            		# Load dispatchers:
-            -
            		foreach ( glob( $this->plugin_path( 'dispatchers/*.php' ) ) as $file ) {
-            -
            			include $file;
-            -
            		}
-            -
-            -
            		# Register built-in and additional dispatchers:
-            -
            		foreach ( apply_filters( 'qm/dispatchers', array(), $this ) as $dispatcher ) {
-            -
            			QM_Dispatchers::add( $dispatcher );
-            -
            		}
-            -
-            -
            	}
-            -
-            -
            	public function activate( $sitewide = false ) {
-            -
-            -
            		if ( $admins = QM_Util::get_admins() ) {
-            -
            			$admins->add_cap( 'view_query_monitor' );
-            -
            		}
-            -
-            -
            		if ( ! file_exists( $db = WP_CONTENT_DIR . '/db.php' ) and function_exists( 'symlink' ) ) {
-            -
            			@symlink( $this->plugin_path( 'wp-content/db.php' ), $db );
-            -
            		}
-            -
-            -
            		if ( $sitewide ) {
-            -
            			update_site_option( 'active_sitewide_plugins', get_site_option( 'active_sitewide_plugins'  ) );
-            -
            		} else {
-            -
            			update_option( 'active_plugins', get_option( 'active_plugins'  ) );
-            -
            		}
-            -
-            -
            	}
-            -
-            -
            	public function deactivate() {
-            -
-            -
            		if ( $admins = QM_Util::get_admins() ) {
-            -
            			$admins->remove_cap( 'view_query_monitor' );
-            -
            		}
-            -
-            -
            		# Only delete db.php if it belongs to Query Monitor
-            -
            		if ( class_exists( 'QM_DB' ) ) {
-            -
            			unlink( WP_CONTENT_DIR . '/db.php' );
-            -
            		}
-            -
-            -
            	}
-            -
-            -
            	public function action_init() {
-            -
-            -
            		load_plugin_textdomain( 'query-monitor', false, dirname( $this->plugin_base() ) . '/languages' );
-            -
-            -
            	}
-            -
-            -
            	public function filter_active_plugins( $plugins ) {
-            -
-            -
            		if ( empty( $plugins ) ) {
-            -
            			return $plugins;
-            -
            		}
-            -
-            -
            		$f = preg_quote( basename( $this->plugin_base() ) );
-            -
-            -
            		return array_merge(
-            -
            			preg_grep( '/' . $f . '$/', $plugins ),
-            -
            			preg_grep( '/' . $f . '$/', $plugins, PREG_GREP_INVERT )
-            -
            		);
-            -
-            -
            	}
-            -
-            -
            	public function filter_active_sitewide_plugins( $plugins ) {
-            -
-            -
            		if ( empty( $plugins ) ) {
-            -
            			return $plugins;
-            -
            		}
-            -
-            -
            		$f = $this->plugin_base();
-            -
-            -
            		if ( isset( $plugins[$f] ) ) {
-            -
-            -
            			unset( $plugins[$f] );
-            -
-            -
            			return array_merge( array(
-            -
            				$f => time(),
-            -
            			), $plugins );
-            -
-            -
            		} else {
-            -
            			return $plugins;
-            -
            		}
-            -
-            -
            	}
-            -
-            -
            	public static function symlink_warning() {
-            -
            		$db = WP_CONTENT_DIR . '/db.php';
-            -
            		trigger_error( sprintf(
-            -
            			esc_html__( 'The symlink at %s is no longer pointing to the correct location. Please remove the symlink, then deactivate and reactivate Query Monitor.', 'query-monitor' ),
-            -
            			'<code>' . esc_html( $db ) . '</code>'
-            -
            		), E_USER_WARNING );
-            -
            	}
-            -
-            -
            	public static function init( $file = null ) {
-            -
-            -
            		static $instance = null;
-            -
-            -
            		if ( ! $instance ) {
-            -
            			$instance = new QueryMonitor( $file );
-            -
            		}
-            -
-            -
            		return $instance;
-            -
-            -
            	}
-            -
-            -
            }
-            -
             QueryMonitor::init( __FILE__ );

             /*
             Plugin Name: Query Monitor
             Description: Monitoring of database queries, hooks, conditionals and more.
+            +
            Version:     2.11.2
+            +
            Plugin URI:  https://github.com/johnbillion/query-monitor
             Author:      John Blackbourn
             Author URI:  https://johnblackbourn.com/
             Text Domain: query-monitor
             defined( 'ABSPATH' ) or die();
+            +
            $qm_dir = dirname( __FILE__ );
+            +
+            +
            # No autoloaders for us. See https://github.com/johnbillion/query-monitor/issues/7
+            +
            foreach ( array( 'Plugin', 'Activation', 'Util' ) as $qm_class ) {
+            +
            	require_once "{$qm_dir}/classes/{$qm_class}.php";
+            +
            }
+            +
+            +
            QM_Activation::init( __FILE__ );
+            +
             if ( defined( 'QM_DISABLED' ) and QM_DISABLED ) {
             	return;
+            }
             	return;
+            }
+            +
            foreach ( array( 'QueryMonitor', 'Backtrace', 'Collectors', 'Collector', 'Dispatchers', 'Dispatcher', 'Output', 'Timer' ) as $qm_class ) {
             	require_once "{$qm_dir}/classes/{$qm_class}.php";
+            }
             QueryMonitor::init( __FILE__ );

readme.txt CHANGED Viewed

@@ -2,8 +2,8 @@
             Contributors: johnbillion
             Tags: ajax, debug, debug-bar, debugging, development, developer, performance, profiler, profiling, queries, query monitor, rest-api
             Requires at least: 3.7
-            -
            Tested up to: 4.5
-            -
            Stable tag: 2.11.1
             License: GPLv2 or later
             View debugging and performance information on database queries, hooks, conditionals, HTTP requests, redirects and more.
@@ -174,391 +174,4 @@ No, I do not accept donations. If you like the plugin, I'd love for you to [leav
             == Changelog ==
-            -
            = 2.11.1 =
-            -
-            -
            * Fix Undefined index: `cache_misses`.
-            -
            * Don't load QM during cron requests because we've no persistent storage yet and no means of outputting data that's collected.
-            -
            * Tweak some colours to bring them inline with the WordPress admin area colours.
-            -
            * Better handling for HTTP requests which don't include the `ssl` argument for any reason.
-            -
-            -
            = 2.11.0 =
-            -
-            -
            * Template parts used in the current request are now listed along with the template file.
-            -
            * Fix the REST API output for embedded requests and internal API calls.
-            -
            * Enable QM's output to appear in customiser preview responses.
-            -
            * Add support for the AMP plugin by Automattic, which short-circuits template output.
-            -
            * Highlight the fact when an HTTP request has disabled certificate verification.
-            -
            * Take into account custom content directory locations that are outside of ABSPATH when removing leading paths from file names.
-            -
            * Even more fallback support for when jQuery is broken or isn't available.
-            -
            * Introduce a collector for the object cache. Only outputs an overview at the moment.
-            -
            * Better formatting in the Duplicate Queries panel.
-            -
            * Introduce a fallback method of detecting errors in queries when `QM_DB` is not in use.
-            -
            * Improve the initial state of QM's output when the admin toolbar is not in use.
-            -
-            -
            = 2.10.0 =
-            -
-            -
            * Add a new panel which lists duplicated database queries.
-            -
            * Add support for displaying QM's output when viewing an embed.
-            -
            * Differentiate regular plugins from mu-plugins when displaying components.
-            -
            * Ensure early errors are always reported regardless of system level error reporting.
-            -
            * Ensure that script and style dependency highlighting is restricted to the scripts and styles tables, respectively.
-            -
            * Rearrange the Environment section output a little.
-            -
            * Various minor tweaks.
-            -
-            -
            = 2.9.1 =
-            -
-            -
            * Query callers and query components can now be clicked to filter the main query list by that caller or component.
-            -
            * Add support for pausing Jetpack's Infinite Scroll module when viewing QM output in the footer.
-            -
            * Add support for WordPress.com VIP Go shared plugins as an explicit component.
-            -
            * Send nocache headers when QM is active.
-            -
            * Various minor tweaks.
-            -
-            -
            = 2.9.0 =
-            -
-            -
            * Introduce a new panel which displays all matching rewrite rules for the current request.
-            -
            * Remove the deprecated `is_comments_popup()` from the list of conditionals.
-            -
            * Improve the display of scripts and styles which are blocked by Airplane Mode (0.1.4 and later).
-            -
            * Gracefully handle enqueued assets which are deregistered late without being unenqueued.
-            -
            * Add a filter to hide the extended query information prompt.
-            -
            * Various minor bugfixes and code quality tweaks.
-            -
-            -
            = 2.8.1 =
-            -
            * Correctly detect the file name and line number responsible for loading translation files in plugins which use `load_textdomain()`.
-            -
            * Correct the visibility of the `before_output()` method in the REST dispatcher.
-            -
            * Load the languages collector early so it catches plugins which load their translation files when they initialise.
-            -
            * Remove an erroneous double quote.
-            -
            * Remove connection as param in `mysqli_get_client_version()`.
-            -
            * Various CSS fixes.
-            -
-            -
            = 2.8.0 =
-            -
            * A new Languages component for debugging languages and text domains. Thanks, @MPolleke!
-            -
            * REST API debugging in the form of HTTP headers when performing an authenticated REST API request. Shows PHP errors when relevant, along with an overview of memory usage, processing time, database query number, and database query time.
-            -
            * Various visual improvements, including displaying the relevant file name below stack trace functions, and a more visible stack trace expansion toggle.
-            -
            * Add `is_embed()`, `is_comment_feed()`, and `is_user_admin()` to the list of conditional functions.
-            -
            * Add HHVM, SAPI, and MySQL client info to the Environment component.
-            -
            * QM is now not loaded at all on the CLI.
-            -
            * Avoid an issue with the CloudFlare Flexible SSL plugin.
-            -
            * Improve the output of Multisite's `$current_blog` and `$current_site` in the Request component.
-            -
            * Fully handle Windows paths when detecting a file component.
-            -
            * Don't display the symlink warning when using a secondary instance of WPDB.
-            -
            * Whole bunch of internal structure refactoring, escaping, and other misc tweaks.
-            -
-            -
            = 2.7.4 =
-            -
            * An unknown component now gets marked as such, not as Core.
-            -
            * Support for invokable objects in action and filter callbacks.
-            -
            * Fix fatal error when activating Debug Bar plugin after Query Monitor has already been activated.
-            -
            * Implement escaping inside `QM_Output_Html::format_url()` which can deal with unsafe output. Thanks to Stephen Harris for the responsible disclosure.
-            -
-            -
            = 2.7.3 =
-            -
            * Improvements to the shutdown handler for PHP errors, so it handles syntax and compilation errors too.
-            -
-            -
            = 2.7.2 =
-            -
            * Implement a shutdown handler for PHP errors to avoid fatals being unintentionally hidden when `display_errors` is on.
-            -
            * Don't attempt to do anything with scripts and styles if a corresponding header action hasn't fired.
-            -
            * Don't sort the enqueued scripts and styles, so they're output in the order in which they're enqueued.
-            -
            * For the time being, let's not load QM when using the CLI because we've no persistent storage and no means of outputting collected data on the CLI.
-            -
            * Call static methods using their class name, not a variable. Fixes compatibility with PHP 5.2.
-            -
-            -
            = 2.7.1 =
-            -
            * Display a warning (rather than triggering a fatal error) for scripts and style dependencies which have gone missing during the duration of the page load.
-            -
            * Tweak some more Debug Bar add-on styles.
-            -
            * Ensure erroneous non-SELECT queries are also highlighted in red.
-            -
            * Further tweaks to QM's output if JavaScript isn't available for any reason.
-            -
            * Add PHP4-style constructors to the Debug Bar classes to avoid fatals with Debug Bar add-ons which are explicitly using them.
-            -
            * In the event that QM's JavaScript doesn't get enqueued, force the QM output to display so users can at least debug the issue.
-            -
            * Remove the abstract `output()` methods from abstract classes which implement `QM_Output` to avoid PHP bug #43200.
-            -
            * Fixing a notice in the admin component when `get_current_screen()` isn't an object.
-            -
-            -
            = 2.7.0 =
-            -
            * Detect broken dependencies for scripts and styles.
-            -
            * Calculate and output the dependents of scripts and styles.
-            -
            * Add transparent support for Debug Bar add-on panels.
-            -
            * Add support for WordPress.com VIP plugins in the component detection.
-            -
            * Sortable and filterable columns for HTTP requests.
-            -
            * Display a warning when something's hooked onto the `all` action.
-            -
            * Clearer output for the template file and component names when a child theme is in use.
-            -
            * Move the current blog information to the Request component. Display current site information if we're running a multi-network.
-            -
            * Allow default error handlers, such as error logging, to continue to function as expected.
-            -
            * Don't skip outputting the calling function name in the database error list.
-            -
            * New namespaced filter names for a bunch of filterable things.
-            -
            * Add a `qm/process` filter to allow users to disable QM's processing and output.
-            -
            * Display the value of `WP_HTTP_BLOCK_EXTERNAL` and `WP_ACCESSIBLE_HOSTS` in the HTTP component.
-            -
            * New storage and registration mechanisms for collectors, dispatchers, and output handlers.
-            -
            * CSS tweaks to better match wp-admin styles.
-            -
-            -
            = 2.6.10 =
-            -
            * Add compatibility with PHP 5.3.6 and lower. `DirectoryIterator::getExtension()` isn't available on this version (and also as it's part of SPL it can be disabled).
-            -
            * Simplify the admin CSS to avoid QM's output being covered by the admin menu.
-            -
            * Add support for footer styles in the scripts and styles component.
-            -
            * Update the authentication JavaScript so it works cross-protocol.
-            -
-            -
            = 2.6.9 =
-            -
            * New Scripts & Styles component
-            -
            * Support for the new `is_customize_preview()` conditional
-            -
            * More robust handling of HTTP requests short-circuited with `pre_http_request`
-            -
            * Introduce a `query_monitor_silent_http_error_codes` filter to allow certain `WP_Error` codes to be silenced in HTTP requests
-            -
            * Split SQL queries on LEFT, OUTER, and RIGHT too
-            -
            * Gracefully avoid fatal errors if a site is moved and the db.php symlink is no longer pointing to the correct location
-            -
            * Pause Infinite Scroll when Query Monitor is viewed
-            -
            * Support the new admin menu behaviour in WP 4.1
-            -
            * Fix the positioning of output when using the Twenty Fifteen theme
-            -
            * Switch to an AJAX call for setting and clearing QM's authentication cookie
-            -
-            -
            = 2.6.8 =
-            -
            * RTL layout tweaks
-            -
            * Correct the component detection logic so it's more accurate
-            -
            * Re-implement output on the login screen which went missing
-            -
            * Display a few more proxy and debugging related constants
-            -
-            -
            = 2.6.7 =
-            -
            * Use an actual authentication cookie instead of a nonce in the Authentication component
-            -
            * Implement some extra methods of determining the current user/group
-            -
            * Move the loading of dispatchers to the `plugins_loaded` hook so plugins can add their own
-            -
            * Misc performance improvements
-            -
-            -
            = 2.6.6 =
-            -
            * More robust support for alternative database drivers (including `mysqli` in core)
-            -
            * Avoid warnings and notices when a custom database class is in place and it's not saving queries (ie. HyperDB)
-            -
            * Better handling when certain functions (such as `memory_get_peak_usage()`) are disabled
-            -
-            -
            = 2.6.5 =
-            -
            * Avoid the "Class 'QM_Backtrace' not found" error
-            -
            * Correct the layout of the Slow Queries and Query Errors panels
-            -
            * Move back-compat CSS into its own file
-            -
            * Huge simplification of code in `db.php` by using `parent::query()`
-            -
            * Misc visual tweaks
-            -
-            -
            = 2.6.4 =
-            -
            * Introduce sortable columns for database query times and numbers
-            -
            * Display the queried object in the Request panel
-            -
            * Fix the admin menu behaviour when viewing QM output
-            -
            * Fixes for output buffering and AJAX requests
-            -
            * Several bits of code cleanup
-            -
-            -
            = 2.6.3 =
-            -
            * Clickable stack traces and file names if you've configured Xdebug's `file_link_format` setting
-            -
            * Show the number of times each PHP error has been triggered
-            -
            * Visual bugfixes when using Firefox
-            -
            * Fix a bug which was preventing AJAX debugging from being output
-            -
            * Fix a fatal error when using PHP 5.2 on Windows
-            -
            * Display HTTP proxy information when appropriate
-            -
            * Introduce the `QM_DISABLE` constant for unconditionally disabling Query Monitor
-            -
            * Always return true from our PHP error handler to suppress unwanted PHP error output (eg. from Xdebug)
-            -
            * Internals: Much more robust logic and even more separation of data collection and output
-            -
            * Internals: Many performance improvements
-            -
-            -
            = 2.6.2 =
-            -
            * Fix two fundamental stability and compatibility issues (great news)
-            -
            * Various visual tweaks
-            -
            * Handle some uncommon use cases of the HTTP API
-            -
-            -
            = 2.6.1 =
-            -
            * Remove a file that was accidentally committed to the wordpress.org repo
-            -
-            -
            = 2.6 =
-            -
            * Toggleable stack traces for queries
-            -
            * Show deprecated errors in the PHP Errors panel
-            -
            * Replace the Query Vars panel with a Request panel with more information
-            -
            * Display a warning when `db.php` isn't in place
-            -
            * Fix some PHP 5.2 compatibility
-            -
            * Considerable restructuring of the underlying code to increase abstraction
-            -
-            -
            = 2.5.6 =
-            -
            * Fix the "Invalid header" issue. Woo!
-            -
-            -
            = 2.5.5 =
-            -
            * Better layout for the Hooks panel
-            -
            * Fix some AJAX issues
-            -
            * Fix some output buffer compatibility issues which were causing fatal errors
-            -
-            -
            = 2.5.4 =
-            -
            * Avoid a fatal error when strict errors are triggered at compile time
-            -
            * Avoid a warning when PDO or Mysqli is in use
-            -
            * Updated CSS for WordPress 3.8. Retains support for default 3.7 and MP6 on 3.7
-            -
            * Tweak PHP error_reporting in the Environment component
-            -
-            -
            = 2.5.3 =
-            -
            * Show an inline error when a hook has an invalid action
-            -
            * Show a warning in the admin toolbar when HTTP requests fail
-            -
            * Fix the time shown when filtering queries
-            -
            * Fix empty stack traces (regression at some point)
-            -
-            -
            = 2.5.2 =
-            -
            * Prevent uncaught exceptions with static method actions
-            -
            * Misc formatting tweaks
-            -
-            -
            = 2.5.1 =
-            -
            * Un-break query filtering
-            -
            * Performance improvements
-            -
-            -
            = 2.5 =
-            -
            * Display the component for HTTP requests, transients, PHP errors, and hook actions
-            -
            * Improved visual appearance and layout
-            -
            * Add an action component filter to the Hooks panel
-            -
            * Log errors returned in the `pre_http_request` filter
-            -
            * `QM_DB_LIMIT` is now a soft limit
-            -
            * Performance improvements
-            -
-            -
            = 2.4.2 =
-            -
            * Add a hook name filter to the Hooks panel
-            -
            * Update db.php to match latest wp-db.php
-            -
            * Avoid fatal error if the plugin is manually deleted
-            -
            * Add the new `is_main_network()` conditional
-            -
            * Lots more tweaks
-            -
-            -
            = 2.4.1 =
-            -
            * Un-break all the things
-            -
-            -
            = 2.4 =
-            -
            * New Redirect component
-            -
            * Add support for strict errors
-            -
            * Display the call stack for HTTP requests
-            -
            * Display the call stack for transients
-            -
            * Remove pre-3.0 back-compat code
-            -
            * Many other bugfixes and tweaks
-            -
-            -
            = 2.3.1 =
-            -
            * Compat with Xdebug
-            -
            * Display the call stack for PHP errors
-            -
-            -
            = 2.3 =
-            -
            * Introduce AJAX debugging (just PHP errors for now)
-            -
            * Visual refresh
-            -
            * Add theme and stylesheet into to the Theme panel
-            -
-            -
            = 2.2.8 =
-            -
            * Add error reporting to the Environment panel
-            -
-            -
            = 2.2.7 =
-            -
            * Don't output QM in the theme customizer
-            -
-            -
            = 2.2.6 =
-            -
            * Add the database query time to the admin toolbar
-            -
            * Various trace and JavaScript errors
-            -
-            -
            = 2.2.5 =
-            -
            * Load QM before other plugins
-            -
            * Show QM output on the log in screen
-            -
-            -
            = 2.2.4 =
-            -
            * Add filtering to the query panel
-            -
-            -
            = 2.2.3 =
-            -
            * Show component information indicating whether a plugin, theme or core was responsible for each database query
-            -
            * New Query Component panel showing components ordered by total query time
-            -
-            -
            = 2.2.2 =
-            -
            * Show memory usage as a percentage of the memory limit
-            -
            * Show page generation time as percentage of the limit, if it's high
-            -
            * Show a few bits of server information in the Environment panel
-            -
            * Log PHP settings as early as possible and highlight when the values have been altered at runtime
-            -
-            -
            = 2.2.1 =
-            -
            * A few formatting and layout tweaks
-            -
-            -
            = 2.2 =
-            -
            * Breakdown queries by type in the Overview and Query Functions panels
-            -
            * Show the HTTP transport order of preference in the HTTP panel
-            -
            * Highlight database errors and slow database queries in their own panels
-            -
            * Add a few PHP enviroment variables to the Environment panel (more to come)
-            -
-            -
            = 2.1.8 =
-            -
            * Change i18n text domain
-            -
            * Hide Authentication panel for non-JS
-            -
            * Show database info in Overview panel
-            -
-            -
            = 2.1.7 =
-            -
            * Full WordPress 3.4 compatibility
-            -
-            -
            = 2.1.6 =
-            -
            * Small tweaks to conditionals and HTTP components
-            -
            * Allow filtering of ignore_class, ignore_func and show_arg on QM and QM DB
-            -
-            -
            = 2.1.5 =
-            -
            * Tweak a few conditional outputs
-            -
            * Full support for all WPDB instances
-            -
            * Tweak query var output
-            -
            * Initial code for data logging before redirects (incomplete)
-            -
-            -
            = 2.1.4 =
-            -
            * Add full support for multiple DB instances to the Environment component
-            -
            * Improve PHP error function stack
-            -
-            -
            = 2.1.3 =
-            -
            * Fix display of wp_admin_bar instantiated queries
-            -
            * Fix function trace for HTTP calls and transients
-            -
-            -
            = 2.1.2 =
-            -
            * Lots more behind the scenes improvements
-            -
            * Better future-proof CSS
-            -
            * Complete separation of data/presentation in db_queries
-            -
            * Complete support for multiple database connections
-            -
-            -
            = 2.1.1 =
-            -
            * Lots of behind the scenes improvements
-            -
            * More separation of data from presentation
-            -
            * Fewer cross-component dependencies
-            -
            * Nicer way of doing menu items, classes & title
-            -
-            -
            = 2.1 =
-            -
            * Let's split everything up into components. Lots of optimisations to come.
-            -
-            -
            = 2.0.3 =
-            -
            * Localisation improvements
-            -
-            -
            = 2.0.2 =
-            -
            * Admin bar tweaks for WordPress 3.3
-            -
            * Add some missing l10n
-            -
            * Prevent some PHP notices
-            -
-            -
            = 2.0.1 =
-            -
            * Just a few rearrangements
-            -
-            -
            = 2.0 =
-            -
            * Show warnings next to MySQL variables with sub-optimal values
-            -
-            -
            = 1.9.3 =
-            -
            * Fix list of non-default query vars
-            -
            * Fix list of admin screen column names in 3.3
-            -
            * Lots of other misc tweaks
-            -
            * Add RTL support
-            -
-            -
            = 1.9.2 =
-            -
            * Lots of interface improvements
-            -
            * Show counts for transients, HTTP requests and custom query vars in the admin menu
-            -
            * Add backtrace to PHP error output
-            -
            * Hide repeated identical PHP errors
-            -
            * Filter out calls to _deprecated_*() and trigger_error() in backtraces
-            -
            * Show do_action_ref_array() and apply_filters_ref_array() parameter in backtraces
-            -
            * Remove the 'component' code
-            -
            * Remove the object cache output
-            -
            * Add a 'qm_template' filter so themes that do crazy things can report the correct template file
-            -
-            -
            = 1.9.1 =
-            -
            * Display all custom column filter names on admin screens that contain columns
-            -
-            -
            = 1.9 =
-            -
            * Display more accurate $current_screen values
-            -
            * Display a warning message about bug with $typenow and $current_screen values
-            -
            * Improve PHP error backtrace
-            -
-            -
            = 1.8 =
-            -
            * Introduce a 'view_query_monitor' capability for finer grained permissions control
-            -
-            -
            = 1.7.11 =
-            -
            * List body classes with the template output
-            -
            * Display calling function in PHP warnings and notices
-            -
            * Fix admin bar CSS when displaying notices
-            -
            * Remove pointless non-existant filter code
-            -
-            -
            = 1.7.10.1 =
-            -
            * Fix a formatting error in the transient table
-            -
-            -
            = 1.7.10 =
-            -
            * Tweaks to counts, HTTP output and transient output
-            -
            * Upgrade routine which adds a symlink to db.php in wp-content/db.php
-            -
-            -
            = 1.7.9 =
-            -
            * PHP warning and notice handling
-            -
            * Add some new template conditionals
-            -
            * Tweaks to counts, HTTP output and transient output

             Contributors: johnbillion
             Tags: ajax, debug, debug-bar, debugging, development, developer, performance, profiler, profiling, queries, query monitor, rest-api
             Requires at least: 3.7
+            +
            Tested up to: 4.6
+            +
            Stable tag: 2.11.2
             License: GPLv2 or later
             View debugging and performance information on database queries, hooks, conditionals, HTTP requests, redirects and more.
             == Changelog ==
+            +
            See [changelog.md](https://github.com/johnbillion/query-monitor/blob/master/changelog.md) for Query Monitor's changelog.

wp-content/db.php CHANGED Viewed

	@@ -40,7 +40,7 @@ if ( defined( 'DOING_CRON' ) && DOING_CRON ) {
40	return;
41	}
42
43	- # No autoloaders for us. See https://github.com/johnbillion/~~QueryMonitor~~/issues/7
44	$qm_dir = dirname( dirname( __FILE__ ) );
45	if ( ! is_readable( $backtrace = "{$qm_dir}/classes/Backtrace.php" ) ) {
46	return;
	@@ -85,6 +85,10 @@ class QM_DB extends wpdb {
85	*/
86	function query( $query ) {
87	if ( ! $this->ready ) {




88	return false;
89	}
90


40	return;
41	}
42
43	+ # No autoloaders for us. See https://github.com/johnbillion/query-monitor/issues/7
44	$qm_dir = dirname( dirname( __FILE__ ) );
45	if ( ! is_readable( $backtrace = "{$qm_dir}/classes/Backtrace.php" ) ) {
46	return;

85	*/
86	function query( $query ) {
87	if ( ! $this->ready ) {
88	+ if ( isset( $this->check_current_query ) ) {
89	+ // This property was introduced in WP 4.2
90	+ $this->check_current_query = true;
91	+ }
92	return false;
93	}
94