1.2.4

webmandesign · Aug 13, 2015 · 1cebd2f · 1cebd2f
1 parent 34bc6d1
commit 1cebd2f
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 12 deletions.
diff --git a/changelog.md b/changelog.md
@@ -1,5 +1,17 @@
 # WebMan Amplifier Changelog
 
+## 1.2.4
+
+* **Update**: Testimonials headings updated to H2 tag
+* **Fix**: Visual Composer shortcodes layout issue (for Posts, Testimonials and Content Modules)
+
+#### Files changed:
+
+	includes/shortcodes/renderers/content_module.php
+	includes/shortcodes/renderers/posts.php
+	includes/shortcodes/renderers/testimonials.php
+
+
 ## 1.2.3
 
 * **Add**: WordPress 4.3 support

diff --git a/includes/shortcodes/renderers/content_module.php b/includes/shortcodes/renderers/content_module.php
@@ -5,7 +5,7 @@
  * This file is being included into "../class-shortcodes.php" file's shortcode_render() method.
  *
  * @since    1.0
- * @version  1.2
+ * @version  1.2.4
  *
  * @param  string align
  * @param  string class
@@ -34,7 +34,7 @@
 			'columns'          => 4,
 			'count'            => -1,
 			'desc_column_size' => 4,
-			'filter'           => false,
+			'filter'           => '',
 			'filter_layout'    => 'fitRows',
 			'heading_tag'      => 'h3',
 			'image_size'       => '',
@@ -85,7 +85,7 @@
 			$atts['desc_column_size'] = 4;
 		}
 	//filter
-		$atts['filter'] = ( $atts['filter'] ) ? ( 'module_tag' ) : ( '' );
+		$atts['filter'] = ( trim( $atts['filter'] ) ) ? ( 'module_tag' ) : ( '' );
 	//filter_layout
 		$atts['filter_layout'] = trim( $atts['filter_layout'] );
 		if ( ! $atts['filter_layout'] ) {
@@ -148,7 +148,7 @@
 		}
 	//content
 		$atts['content'] = apply_filters( 'wmhook_shortcode_' . '_content', $content, $shortcode, $atts );
-		$atts['content'] = apply_filters( 'wmhook_shortcode_' . $shortcode . '_content', $atts['content'], $atts );
+		$atts['content'] = trim( apply_filters( 'wmhook_shortcode_' . $shortcode . '_content', $atts['content'], $atts ) );
 	//class
 		if (
 				! $atts['filter']

diff --git a/includes/shortcodes/renderers/posts.php b/includes/shortcodes/renderers/posts.php
@@ -6,7 +6,7 @@
  * Contains Schema.org markup function.
  *
  * @since    1.0
- * @version  1.2.3
+ * @version  1.2.4
  *
  * @uses   $codes_globals['post_types']
  *
@@ -154,7 +154,7 @@
 		}
 	//content
 		$atts['content'] = apply_filters( 'wmhook_shortcode_' . '_content', $content, $shortcode, $atts );
-		$atts['content'] = apply_filters( 'wmhook_shortcode_' . $shortcode . '_content', $atts['content'], $atts );
+		$atts['content'] = trim( apply_filters( 'wmhook_shortcode_' . $shortcode . '_content', $atts['content'], $atts ) );
 	//class
 		if (
 				! $atts['filter']

diff --git a/includes/shortcodes/renderers/testimonials.php b/includes/shortcodes/renderers/testimonials.php
@@ -5,7 +5,7 @@
  * This file is being included into "../class-shortcodes.php" file's shortcode_render() method.
  *
  * @since    1.0
- * @version  1.2.3
+ * @version  1.2.4
  *
  * @param  string align
  * @param  string category (testimonials category slug)
@@ -103,7 +103,7 @@
 		}
 	//content
 		$atts['content'] = apply_filters( 'wmhook_shortcode_' . '_content', $content, $shortcode, $atts );
-		$atts['content'] = apply_filters( 'wmhook_shortcode_' . $shortcode . '_content', $atts['content'], $atts );
+		$atts['content'] = trim( apply_filters( 'wmhook_shortcode_' . $shortcode . '_content', $atts['content'], $atts ) );
 	//class
 		if ( false !== strpos( $atts['class'], 'masonry' ) ) {
 			//Use masonry when "masonry" class set
@@ -227,7 +227,7 @@
 
 						// Testimonial title (for accessibility)
 
-							$output_item .= '<h1 class="screen-reader-text">' . get_the_title( $post_id ) . '</h1>';
+							$output_item .= '<h2 class="screen-reader-text">' . get_the_title( $post_id ) . '</h2>';
 
 						// Testimonial content
 

diff --git a/readme.txt b/readme.txt
@@ -92,10 +92,13 @@ Please note that the plugin integrates an Isotope JavaScript filter. This script
 
 == Changelog ==
 
-Please see the [`CHANGELOG.md` file](https://github.com/webmandesign/webman-amplifier/blob/master/CHANGELOG.md) for details.
+Please see the [`changelog.md` file](https://github.com/webmandesign/webman-amplifier/blob/master/changelog.md) for details.
 
 == Upgrade Notice ==
 
+= 1.2.4 =
+Fixing Visual Composer shortcodes layout issue (for Posts, Testimonials and Content Modules).
+
 = 1.2.3 =
 WordPress 4.3 support, redesigned metabox controls, accessibility improvements, improved shortcodes overriding, fixed issue with Visual Composer custom shortcode mapping via dashboard.
 

diff --git a/webman-amplifier.php b/webman-amplifier.php
@@ -13,7 +13,7 @@
  * Plugin Name:        WebMan Amplifier
  * Plugin URI:         http://www.webmandesign.eu/
  * Description:        Pack of additional WordPress features. Contains shortcodes, additional custom post types, meta box generator, Visual Composer plugin (3rd party) integration, icon font management.
- * Version:            1.2.3
+ * Version:            1.2.4
  * Author:             WebMan - Oliver Juhas
  * Author URI:         http://www.webmandesign.eu/
  * Text Domain:        wm_domain
@@ -44,7 +44,7 @@
 
 		// Plugin version
 
-			if ( ! defined( 'WMAMP_VERSION' ) ) define( 'WMAMP_VERSION', '1.2.3' );
+			if ( ! defined( 'WMAMP_VERSION' ) ) define( 'WMAMP_VERSION', '1.2.4' );
 
 		// Paths