version 1.8.5.1

fixing swaptitle
baden03 · Aug 24, 2023 · 479917f · 479917f
1 parent 6d808e5
commit 479917f
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/README.md b/README.md
@@ -4,7 +4,7 @@
 * Tags: collapse, expand, collapsible, expandable, expandable content, collapsable content, shortcode, hidden, hide, display, accordion, accordion, jQuery, javascript, roll-your-own, twinpictures, read me, read more, more, plugin oven
 * Requires at least: 4.9
 * Tested up to: 6.3.0
-* Stable tag: 1.8.5.1
+* Stable tag: 1.8.5.2
 * Requires PHP: 7.2
 * License: GPLv2 or later
 * License URI: https://www.gnu.org/licenses/gpl-2.0.html

diff --git a/collapse-o-matic.php b/collapse-o-matic.php
@@ -4,7 +4,7 @@
 Text Domain: jquery-collapse-o-matic
 Plugin URI: https://pluginoven.com/plugins/collapse-o-matic/
 Description: Collapse-O-Matic adds an [expand] shortcode that wraps content into a lovely, jQuery collapsible div.
-Version: 1.8.5.1
+Version: 1.8.5.2
 Author: twinpictures, baden03
 Author URI: https://twinpictures.de/
 License: GPL2
@@ -29,7 +29,7 @@ class WP_Collapse_O_Matic {
 	 * Current version
 	 * @var string
 	 */
-	var $version = '1.8.5.1';
+	var $version = '1.8.5.2';
 
 	/**
 	 * Used as prefix for options entry
@@ -419,7 +419,7 @@ function shortcode($atts, $content = null){
 			if(!empty($trigtype) && $trigtype == 'image' && !empty($triggerimage)){
 				$title =  wp_get_attachment_image( $triggerimage, 'full' );
 			}
-			$link = $closeanchor.'<'. esc_attr($tag) .' class="collapseomatic '.esc_attr($trigclass).'" id="'.esc_attr($id).'" '.$relatt.' '.$inexatt.' '.$altatt.' '.$anchor.' '.$groupatt.' '.$effatt.' '.$duratt.'>'.esc_attr($startwrap).$title.esc_attr($endwrap).'</'. esc_attr($tag) .'>';
+			$link = $closeanchor.'<'. esc_attr($tag) .' class="collapseomatic '.esc_attr($trigclass).'" id="'.esc_attr($id).'" '.$relatt.' '.$inexatt.' '.$altatt.' '.$anchor.' '.$groupatt.' '.$effatt.' '.$duratt.'>'.$startwrap.$title.$endwrap.'</'. esc_attr($tag) .'>';
 		}
 
 		//swap image
@@ -437,7 +437,7 @@ function shortcode($atts, $content = null){
 			if(!empty($swapalt)){
 				$swapalt_attr = "alt='".esc_attr($swapalt)."'";
 			}
-			$link .= "<". esc_attr($tag) ." id='swap-".esc_attr($id)."' ".esc_attr($swapalt_attr)." class='colomat-swap' style='display:none;'>".esc_attr($startwrap). esc_attr( $swaptitle ).esc_attr($endwrap)."</". esc_attr($tag) .">";
+			$link .= "<". esc_attr($tag) ." id='swap-".esc_attr($id)."' ".esc_attr($swapalt_attr)." class='colomat-swap' style='display:none;'>".$startwrap.$swaptitle.$endwrap."</". esc_attr($tag) .">";
 		}
 
 		if($excerpt){

diff --git a/readme.txt b/readme.txt
@@ -5,7 +5,7 @@ Donate link: https://pluginoven.com/panares-fund/
 Tags: collapse, expand, collapsible, expandable, expandable content, collapsable content, shortcode, hidden, hide, display, accordion, accordion, jQuery, javascript, roll-your-own, twinpictures, read me, read more, more, plugin oven
 Requires at least: 4.9
 Tested up to: 6.3.0
-Stable tag: 1.8.5.1
+Stable tag: 1.8.5.2
 Requires PHP: 7.2
 License: GPLv2 or later
 License URI: https://www.gnu.org/licenses/gpl-2.0.html
@@ -51,8 +51,11 @@ No. Not even close.
 
 == Changelog ==
 
+= 1.8.5.2 =
+* no longer escaping swaptitle
+
 = 1.8.5.1 =
-* no longer sanitising title string
+* no longer escaping or sanatizing title string
 
 = 1.8.5 =
 * using sanatize_title for the title tag