Merge branch 'develop' into trunk

CHANGELOG.md

@@ -2,6 +2,16 @@
 
 All notable changes to this project will be documented in this file, per [the Keep a Changelog standard](http://keepachangelog.com/).
 
+## [Unreleased]
+
+## [2.1.1] - 2022-08-04
+
+### Security
+- Fix XSS vulnerability. Props [@piotr-bajer](https://github.com/piotr-bajer) and [@felipeelia](https://github.com/felipeelia) via [#52](https://github.com/10up/debug-bar-elasticpress/pull/52).
+- Bumped `path-parse` from 1.0.6 to 1.0.7. Props [@dependabot](https://github.com/dependabot) via [#49](https://github.com/10up/debug-bar-elasticpress/pull/49).
+- Bumps `minimist` from 1.2.5 to 1.2.6. Props [@dependabot](https://github.com/dependabot) via [#51](https://github.com/10up/debug-bar-elasticpress/pull/51).
+- Bumps `ansi-regex` from 5.0.0 to 5.0.1. Props [@dependabot](https://github.com/dependabot) via [#53](https://github.com/10up/debug-bar-elasticpress/pull/53).
+
 ## [2.1.0] - 2021-08-09
 
 ### Added
@@ -41,6 +51,7 @@ This release drops the support for older versions of WordPress Core, ElasticPres
 * Initial release
 
 [Unreleased]: https://github.com/10up/debug-bar-elasticpress/compare/trunk...develop
+[2.1.1]: https://github.com/10up/debug-bar-elasticpress/compare/2.1.0...2.1.1
 [2.1.0]: https://github.com/10up/debug-bar-elasticpress/compare/2.0.0...2.1.0
 [2.0.0]: https://github.com/10up/debug-bar-elasticpress/compare/1.4...2.0.0
 [1.4]: https://github.com/10up/debug-bar-elasticpress/compare/1.3...1.4

CREDITS.md

@@ -12,7 +12,21 @@ The following individuals are responsible for curating the list of issues, respo
 
 Thank you to all the people who have already contributed to this repository via bug reports, code, design, ideas, project management, translation, testing, etc.
 
-[Taylor Lovett (@tlovett1)](https://github.com/tlovett1), [Ivan Kristianto (@ivankristianto)](https://github.com/ivankristianto), [Allan Collins (@allan23)](https://github.com/allan23), [Eugene Manuilov (@eugene-manuilov)](https://github.com/eugene-manuilov), [Ricardo Moraleida (@moraleida)](https://github.com/moraleida), [Andreas Ek (@ekandreas)](https://github.com/ekandreas), [Nathaniel (@nathanielks)](https://github.com/nathanielks), [Jeffrey Paul (@jeffpaul)](https://github.com/jeffpaul), [Felipe Elia (@felipeelia)](https://github.com/felipeelia), [Ramon Ahnert (@Rahmon)](https://github.com/Rahmon), [Oscar Sanchez S. (@oscarssanchez)](https://github.com/oscarssanchez), [Nathaniel (@nathanielks)](https://github.com/nathanielks), and [Christoph Bratschi (@cbratschi)](https://github.com/cbratschi).
+[Taylor Lovett (@tlovett1)](https://github.com/tlovett1),
+[Ivan Kristianto (@ivankristianto)](https://github.com/ivankristianto),
+[Allan Collins (@allan23)](https://github.com/allan23),
+[Eugene Manuilov (@eugene-manuilov)](https://github.com/eugene-manuilov),
+[Ricardo Moraleida (@moraleida)](https://github.com/moraleida),
+[Andreas Ek (@ekandreas)](https://github.com/ekandreas),
+[Nathaniel (@nathanielks)](https://github.com/nathanielks),
+[Jeffrey Paul (@jeffpaul)](https://github.com/jeffpaul),
+[Felipe Elia (@felipeelia)](https://github.com/felipeelia),
+[Ramon Ahnert (@Rahmon)](https://github.com/Rahmon),
+[Oscar Sanchez S. (@oscarssanchez)](https://github.com/oscarssanchez),
+[Nathaniel (@nathanielks)](https://github.com/nathanielks),
+[Piotr Bajer (@piotr-bajer)](https://github.com/piotr-bajer),
+and
+[Christoph Bratschi (@cbratschi)](https://github.com/cbratschi).
 
 ## Libraries
 

README.md

@@ -2,7 +2,7 @@
 
 > A WordPress plugin that adds a [Debug Bar](https://wordpress.org/plugins/debug-bar/) panel to examine ElasticPress queries.
 
-[![Support Level](https://img.shields.io/badge/support-active-green.svg)](#support-level) [![Release Version](https://img.shields.io/github/tag/10up/debug-bar-elasticpress.svg?label=release)](https://github.com/10up/debug-bar-elasticpress/releases/latest) ![WordPress tested up to version](https://img.shields.io/badge/WordPress-v5.8%20tested-success.svg) [![GPLv2 License](https://img.shields.io/github/license/10up/debug-bar-elasticpress.svg)](https://github.com/10up/debug-bar-elasticpress/blob/trunk/LICENSE.md)
+[![Support Level](https://img.shields.io/badge/support-active-green.svg)](#support-level) [![Release Version](https://img.shields.io/github/tag/10up/debug-bar-elasticpress.svg?label=release)](https://github.com/10up/debug-bar-elasticpress/releases/latest) ![WordPress tested up to version](https://img.shields.io/wordpress/plugin/tested/debug-bar-elasticpress?label=WordPress) [![GPLv2 License](https://img.shields.io/github/license/10up/debug-bar-elasticpress.svg)](https://github.com/10up/debug-bar-elasticpress/blob/trunk/LICENSE.md)
 
 ## Requirements
 

classes/class-ep-debug-bar-query-output.php

@@ -88,14 +88,14 @@ public static function render_query( $query, $type = '' ) {
 			<?php if ( ! empty( $query['args']['headers'] ) ) : ?>
 				<div class="ep-query-headers">
 					<strong><?php esc_html_e( 'Headers:', 'debug-bar-elasticpress' ); ?> <div class="query-headers-toggle dashicons"></div></strong>
-					<pre class="query-headers"><?php echo wp_kses_post( var_dump( $query['args']['headers'], true ) ); ?></pre>
+					<pre class="query-headers"><?php echo esc_html( var_export( $query['args']['headers'], true ) ); ?></pre>
 				</div>
 			<?php endif; ?>
 
 			<?php if ( ! empty( $query['query_args'] ) ) : ?>
 				<div class="ep-query-args">
 					<strong><?php esc_html_e( 'Query Args:', 'debug-bar-elasticpress' ); ?> <div class="query-args-toggle dashicons"></div></strong>
-					<pre class="query-args"><?php echo wp_kses_post( var_dump( $query['query_args'], true ) ); ?></pre>
+					<pre class="query-args"><?php echo esc_html( var_export( $query['query_args'], true ) ); ?></pre>
 				</div>
 			<?php endif; ?>
 

debug-bar-elasticpress.php

@@ -4,7 +4,7 @@
  * Plugin URI:   https://wordpress.org/plugins/debug-bar-elasticpress
  * Description:  Extends the debug bar plugin for ElasticPress queries.
  * Author:       10up
- * Version:      2.1.0
+ * Version:      2.1.1
  * Author URI:   https://10up.com
  * Requires PHP: 5.4
  * License:      GPLv2
@@ -13,7 +13,7 @@
  * @package DebugBarElasticPress
  */
 
-define( 'EP_DEBUG_VERSION', '2.1.0' );
+define( 'EP_DEBUG_VERSION', '2.1.1' );
 define( 'EP_DEBUG_URL', plugin_dir_url( __FILE__ ) );
 
 /**

package.json

@@ -1,6 +1,6 @@
 {
   "name": "debug-bar-elasticpress",
-  "version": "2.1.0",
+  "version": "2.1.1",
   "description": "Extends the Debug Bar plugin for ElasticPress queries.",
   "main": "index.js",
   "scripts": {

readme.txt

@@ -2,9 +2,9 @@
 Contributors: tlovett1, 10up
 Tags: debug, debug bar, elasticpress, elasticsearch
 Requires at least: 4.6
-Tested up to: 5.8
+Tested up to: 6.0.1
 Requires PHP: 5.4
-Stable tag: 2.1.0
+Stable tag: 2.1.1
 License: GPLv2
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 
@@ -27,14 +27,26 @@ Adds an [ElasticPress](https://wordpress.org/plugins/elasticpress) panel to the
 
 == Changelog ==
 
+= [2.1.1] - 2022-08-04 =
+
+Security:
+
+* Fix XSS vulnerability. Props [@piotr-bajer](https://github.com/piotr-bajer) and [@felipeelia](https://github.com/felipeelia).
+* Bumped `path-parse` from 1.0.6 to 1.0.7. Props [@dependabot](https://github.com/dependabot).
+* Bumps `minimist` from 1.2.5 to 1.2.6. Props [@dependabot](https://github.com/dependabot).
+* Bumps `ansi-regex` from 5.0.0 to 5.0.1. Props [@dependabot](https://github.com/dependabot).
+
+
 = 2.1.0 =
 
 Added:
+
 * ElasticPress and Elasticsearch versions. Props to [@oscarssanchez](https://github.com/oscarssanchez) and [@felipeelia](https://github.com/felipeelia) via [#43](https://github.com/10up/debug-bar-elasticpress/pull/43)
 * Log of bulk_index requests. Props [@felipeelia](https://github.com/felipeelia) via [#44](https://github.com/10up/debug-bar-elasticpress/pull/44)
 * Warning when ElasticPress is indexing. Props [@nathanielks](https://github.com/nathanielks) and [@felipeelia](https://github.com/felipeelia) via [#45](https://github.com/10up/debug-bar-elasticpress/pull/45)
 
 Changed:
+
 * Only load CSS and JS files for logged-in users. Props [@cbratschi](https://github.com/cbratschi) and [@felipeelia](https://github.com/felipeelia) via [#47](https://github.com/10up/debug-bar-elasticpress/pull/47)
 
 = 2.0.0 =