Merge branch 'release/1.9.6'

CHANGES.md

@@ -1,5 +1,8 @@
 # Changelog
 
+## 1.9.6 (1/19/24)
+* Fixed: Encoded special characters were displaying on the front end in some configurations.
+
 ## 1.9.5 (1/18/24)
 * Fixed: Custom post type archive conditions not working in some configurations.
 * Fixed: Remove unnecessary encoding in PHP's DOMDocument which was unintentionally encoding some special characters from non-English languages.

includes/utilities.php

@@ -246,6 +246,9 @@ function maicca_get_dom_document( $html ) {
 	// Modify state.
 	$libxml_previous_state = libxml_use_internal_errors( true );
 
+	// Encode.
+	$html = mb_encode_numericentity( $html, [0x80, 0x10FFFF, 0, ~0], 'UTF-8' );
+
 	// Load the content in the document HTML.
 	$dom->loadHTML( "<div>$html</div>" );
 
@@ -270,6 +273,22 @@ function maicca_get_dom_document( $html ) {
 	return $dom;
 }
 
+/**
+ * Saves HTML from DOMDocument and decode entities.
+ *
+ * @since TBD
+ *
+ * @param DOMDocument $dom
+ *
+ * @return string
+ */
+function maicca_get_dom_html( $dom ) {
+	$html = $dom->saveHTML();
+	$html = mb_convert_encoding( $html, 'UTF-8', 'HTML-ENTITIES' );
+
+	return $html;
+}
+
 /**
  * Adds content area to existing content/HTML.
  *
@@ -387,7 +406,7 @@ function maicca_add_cca( $content, $cca_content, $args ) {
 	}
 
 	// Save new HTML.
-	$content = $dom->saveHTML();
+	$content = maicca_get_dom_html( $dom );
 
 	return $content;
 }

mai-custom-content-areas.php

@@ -4,7 +4,7 @@
  * Plugin Name:     Mai Custom Content Areas
  * Plugin URI:      https://bizbudding.com/mai-theme/plugins/mai-custom-content-areas/
  * Description:     Display content, calls to action, ads, etc. on posts, pages, and custom post types conditionally by category, tag, taxonomy, entry title, and more.
- * Version:         1.9.5
+ * Version:         1.9.6
  *
  * Author:          BizBudding
  * Author URI:      https://bizbudding.com
@@ -92,7 +92,7 @@ public function __wakeup() {
 	private function setup_constants() {
 		// Plugin version.
 		if ( ! defined( 'MAI_CCA_VERSION' ) ) {
-			define( 'MAI_CCA_VERSION', '1.9.5' );
+			define( 'MAI_CCA_VERSION', '1.9.6' );
 		}
 
 		// Plugin Folder Path.