Merge branch 'release/v2.2.1' into develop

.gitignore

@@ -1,4 +1,7 @@
 sftp-config.json
 notes.txt
 .gitignore
-.DS_Store
+.DS_Store
+admin/css/dump-print-r/dump-print-r.css
+
+admin/css/dump-print-tree/dump-print-tree.css

README.md

@@ -1,11 +1,11 @@
 # Variable Inspector
 
 Contributors: qriouslad  
-Donate link: https://bowo.io/go/sponsor-vi/  
+Donate link: https://bowo.io/dotorg-sponsor-vi  
 Tags: php variables, variable dump, debug, developer  
 Requires at least: 4.8  
 Tested up to: 6.2  
-Stable tag: 2.2.0  
+Stable tag: 2.2.1  
 Requires PHP: 5.6  
 License: GPLv2 or later  
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -36,20 +36,19 @@ This would help you locate and clean up the inspector lines once you're done deb
 
 ### Give Back
 
-* [A nice review](https://bowo.io/add-review-vi/) would be great!
-* [Give feedback](https://bowo.io/feedback-vi/) and help improve future versions.
-* [Github repo](https://bowo.io/github-vi/) to contribute code.
-* [Sponsor](https://bowo.io/sponsor-vi/) my work.
+* [A nice review](https://bowo.io/add-review-vi) would be great!
+* [Give feedback](https://bowo.io/feedback-vi) and help improve future versions.
+* [Github repo](https://bowo.io/github-vi) to contribute code.
+* [Sponsor](https://bowo.io/dotorg-sponsor-vi) my work.
 
 ### Check These Out Too
 
-* [Admin and Site Enhancements](https://bowo.io/asenha-via-vi/) helps you to easily enhance various admin workflows and site aspects while replacing multiple plugins doing it.
-* [System Dashboard](https://bowo.io/sd-via-vi/): Central dashboard to monitor various WordPress components, processes and data, including the server.
-* [Debug Log Manager](https://bowo.io/dlm-via-vi/): Log PHP, database and JavaScript errors via WP_DEBUG with one click. Conveniently create, view, filter and clear the debug.log file.
-* [Code Explorer](https://bowo.io/ce-via-vi/): Fast directory explorer and file/code viewer with syntax highlighting.
-* [Database Admin](https://bowo.io/da-via-vi/): Securely manage your WordPress website's database with a clean and user-friendly interface based on a custom-themed Adminer app. Only available on Github.
-* [Flexible Scroll Top](https://bowo.io/fst-via-vi/) and [Floating Share Buttons](https://bowo.io/fsb-via-vi/) is a lightweight combo with minimalist UI.
-* [WordPress Newsboard](https://bowo.io/wpn-vi/): The latest news, articles, podcasts and videos from 100+ WordPress-focused sources.
+* [Admin and Site Enhancements](https://wordpress.org/plugins/admin-site-enhancements/) helps you to easily enhance various admin workflows and site aspects while replacing multiple plugins doing it.
+* [System Dashboard](https://wordpress.org/plugins/system-dashboard/): Central dashboard to monitor various WordPress components, processes and data, including the server.
+* [Debug Log Manager](https://wordpress.org/plugins/debug-log-manager/): Log PHP, database and JavaScript errors via WP_DEBUG with one click. Conveniently create, view, filter and clear the debug.log file.
+* [Code Explorer](https://wordpress.org/plugins/code-explorer/): Fast directory explorer and file/code viewer with syntax highlighting.
+* [Flexible Scroll Top](https://wordpress.org/plugins/flexible-scroll-top/) and [Floating Share Buttons](https://wordpress.org/plugins/floating-share-button/) is a lightweight combo with minimalist UI.
+* [WordPress Newsboard](https://www.wpnewsboard.com/): The latest news, articles, podcasts and videos from 100+ WordPress-focused sources.
 
 ## Screenshots
 
@@ -64,6 +63,10 @@ Variable Inspector was built with: [WordPress Plugin Boilerplate](https://github
 
 ## Changelog
 
+### 2.2.1 (2023.04.16)
+
+* Improve escaping of variables with string type. Preventing inspector layout / HTML output interferrence, especially when the string contains HTML tags.
+
 ### 2.2.0 (2023.04.13)
 
 * Clean up and polish inspector dashboard UI. Remove separator lines.
@@ -78,8 +81,8 @@ Variable Inspector was built with: [WordPress Plugin Boilerplate](https://github
 
 * Add button to easily generate sample results. Useful for first-time installation.
 * Overall UI/X polish which includes adding loading animation on button clicks, improved auto-refresh UI, improved readability of variable type labels and ensure preferred/chosen viewer is effective/respected after varioius clicks / interaction with the inspection dashboard.
-* Change 'Donate' (PayPal) link to [(Github) 'Sponsor'](https://bowo.io/go/sponsor-vi/) link. Do consider sponsoring the continued development of Variable Inspector.
-* Add link to [WordPress Newsboard](https://bowo.io/go/wpn-vi/) in footer, a WordPress news aggregator site I've maintained since 2014.
+* Change 'Donate' (PayPal) link to [(Github) 'Sponsor'](https://bowo.io/sponsor-vi) link. Do consider sponsoring the continued development of Variable Inspector.
+* Add link to [WordPress Newsboard](https://bowo.io/wpn-vi) in footer, a WordPress news aggregator site I've maintained since 2014.
 * Integrate Freemius SDK in preparation for Pro version.
 
 ### 1.9.0 (2023.04.04)

admin/class-variable-inspector-admin.php

@@ -393,13 +393,13 @@ public function vi_inspection_results()
                                 <a class="item" data-tab="print_r">print_r</a>';
             $output .= '</div>
                             <div class="ui tab varexport" data-tab="var_export">
-                                <pre>' . $variable_content_varexport . '</pre>
+                                <pre>' . esc_html( $variable_content_varexport ) . '</pre>
                             </div>
                             <div class="ui tab vardump" data-tab="var_dump">
-                                <pre>' . $variable_content_vardump . '</pre>
+                                <pre>' . esc_html( $variable_content_vardump ) . '</pre>
                             </div>
                             <div class="ui tab printr" data-tab="print_r">
-                                <pre>' . print_r( $variable_content, true ) . '</pre>
+                                <pre>' . esc_html( print_r( $variable_content, true ) ) . '</pre>
                             </div>';
             $output .= '<script>
                                 jQuery("#' . esc_html( $identifier ) . ' .functions .item")

variable-inspector.php

@@ -16,7 +16,7 @@
  * Plugin Name:       Variable Inspector
  * Plugin URI:        https://wordpress.org/plugins/variable-inspector/
  * Description:       Easily dump and centrally inspect your PHP variables for convenient debugging.
- * Version:           2.2.0
+ * Version:           2.2.1
  * Author:            Bowo
  * Author URI:        https://bowo.io
  * License:           GPL-2.0+
@@ -34,7 +34,7 @@
  * Start at version 1.0.0 and use SemVer - https://semver.org
  * Rename this for your plugin and update it as you release new versions.
  */
-define( 'VARIABLE_INSPECTOR_VERSION', '2.2.0' );
+define( 'VARIABLE_INSPECTOR_VERSION', '2.2.1' );
 // Freemius SDK integration
 
 if ( function_exists( 'bwvi_fs' ) ) {