Merge branch 'release/2.6.4'

Author: danieliser

CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## Unreleased
 
+## v2.6.4 - 05/09/2025
+
+-   Fix: Revert change in previous update that broke rendering of some shortcodes within `[content_control]` shortcode inner contents.
+
 ## v2.6.3 - 05/08/2025
 
 -   Fix: Excerpt rendering when custom message wasn't set.

classes/Controllers/Shortcodes.php

@@ -97,7 +97,7 @@ public function content_control( $atts, $content = '' ) {
 			$container,
 			esc_attr( $classes ),
 			// Sanitize the content output, allowing safe HTML and processed shortcodes.
-			wp_kses_post( do_shortcode( $content ) ),
+			do_shortcode( $content ),
 			// Sanitize the message output, allowing safe HTML and processed shortcodes.
 			wp_kses_post( do_shortcode( $atts['message'] ) )
 		);

content-control.php

@@ -3,7 +3,7 @@
  * Plugin Name: Content Control
  * Plugin URI: https://contentcontrolplugin.com/?utm_campaign=plugin-info&utm_source=php-file-header&utm_medium=plugin-ui&utm_content=plugin-uri
  * Description: Restrict content to logged in/out users or specific user roles. Restrict access to certain parts of a page/post. Control the visibility of widgets.
- * Version: 2.6.3
+ * Version: 2.6.4
  * Author: Code Atlantic
  * Author URI: https://code-atlantic.com/?utm_campaign=plugin-info&utm_source=php-file-header&utm_medium=plugin-ui&utm_content=author-uri
  * Donate link: https://code-atlantic.com/donate/?utm_campaign=donations&utm_source=php-file-header&utm_medium=plugin-ui&utm_content=donate-link
@@ -30,7 +30,7 @@ function get_plugin_config() {
 	return [
 		'name'          => 'Content Control',
 		'slug'          => 'content-control',
-		'version'       => '2.6.3',
+		'version'       => '2.6.4',
 		'option_prefix' => 'content_control',
 		// Maybe remove this and simply prefix `name` with `'Popup Maker'`.
 		'text_domain'   => 'content-control',

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "content-control",
-	"version": "2.6.3",
+	"version": "2.6.4",
 	"description": "",
 	"author": "Code Atlantic LLC",
 	"license": "GPL-2.0-or-later",

readme.txt

@@ -6,7 +6,7 @@ Donate link: https://code-atlantic.com/donate/?utm_campaign=donations&utm_source
 Tags: membership, access control, members only, content restriction, maintenance mode
 Requires at least: 6.2
 Tested up to: 6.8.1
-Stable tag: 2.6.3
+Stable tag: 2.6.4
 Requires PHP: 7.4
 License: GPLv3 (or later)
 
@@ -110,6 +110,10 @@ Bugs can be reported either in our support forum or we are happy to accept PRs o
 
 == Changelog ==
 
+= v2.6.4 - 05/09/2025 =
+
+* Fix: Revert change in previous update that broke rendering of some shortcodes within `[content_control]` shortcode inner contents.
+
 = v2.6.3 - 05/08/2025 =
 
 * Fix: Excerpt rendering when custom message wasn't set.