Version bump to 1.2.3

cherry-plugin.php

@@ -1,7 +1,7 @@
 <?php
 /*
 	Plugin Name: Cherry Plugin
-	Version: 1.2.2
+	Version: 1.2.3
 	Plugin URI: http://www.cherryframework.com/update/meet-the-cherry-plugin-bare-functionalities-no-strings-attached/
 	Description: Cherry team has already created a Cherry framework that can be reasonably called perfect, but we are always looking for more improvements. Meet the Cherry Plugin. This is an extension for our Cherry framework where we've included all shortcodes and widgets you will ever need. The plugin is fully compatible with any WordPress theme powered by Cherry Framework. So far the plugin is a beta release, but we're going to keep on improving it, to deliver even more cool features.
 	Author: Cherry Team.

includes/shortcodes/columns.php

@@ -1,25 +1,17 @@
 <?php
 // Columns
 function cherry_grid_column( $atts, $content = null, $shortcodename = '' ) {
-	extract( shortcode_atts( array(
-		'custom_class' => ''
-	), $atts ) );
-
 	//remove wrong nested <p>
 	$content = remove_invalid_tags( $content, array('p') );
 
-	$content = wpautop( $content );
-
-	// Allow other shortcodes inside the column content.
-	if ( false !== strpos( $content, '[' ) )
-		$content = do_shortcode( shortcode_unautop( $content ) );
-
+	extract(shortcode_atts(array(
+		'custom_class'  => ''
+	), $atts));
+	// add divs to the content
 	$return = '<div class="' . $shortcodename . ' ' . $custom_class . '">';
 	$return .= do_shortcode( $content );
 	$return .= '</div>';
 
-	$return = apply_filters( 'cherry_plugin_shortcode_output', $return, $atts, $shortcodename );
-
 	return $return;
 }
 add_shortcode( 'span1', 'cherry_grid_column' );
@@ -42,12 +34,6 @@ function one_half_column($atts, $content = null) {
 	//remove wrong nested <p>
 	$content = remove_invalid_tags( $content, array('p') );
 
-	$content = wpautop( $content );
-
-	// Allow other shortcodes inside the column content.
-	if ( false !== strpos( $content, '[' ) )
-		$content = do_shortcode( shortcode_unautop( $content ) );
-
 	// add divs to the content
 	$return = '<div class="span6">';
 	$return .= do_shortcode( $content );
@@ -62,12 +48,6 @@ function one_third_column( $atts, $content = null ) {
 	//remove wrong nested <p>
 	$content = remove_invalid_tags( $content, array('p') );
 
-	$content = wpautop( $content );
-
-	// Allow other shortcodes inside the column content.
-	if ( false !== strpos( $content, '[' ) )
-		$content = do_shortcode( shortcode_unautop( $content ) );
-
 	// add divs to the content
 	$return = '<div class="span4">';
 	$return .= do_shortcode( $content );
@@ -82,12 +62,6 @@ function two_third_column( $atts, $content = null ) {
 	//remove wrong nested <p>
 	$content = remove_invalid_tags( $content, array('p') );
 
-	$content = wpautop( $content );
-
-	// Allow other shortcodes inside the column content.
-	if ( false !== strpos( $content, '[' ) )
-		$content = do_shortcode( shortcode_unautop( $content ) );
-
 	// add divs to the content
 	$return = '<div class="span8">';
 	$return .= do_shortcode( $content );
@@ -102,12 +76,6 @@ function one_fourth_column( $atts, $content = null ) {
 	//remove wrong nested <p>
 	$content = remove_invalid_tags( $content, array('p') );
 
-	$content = wpautop( $content );
-
-	// Allow other shortcodes inside the column content.
-	if ( false !== strpos( $content, '[' ) )
-		$content = do_shortcode( shortcode_unautop( $content ) );
-
 	// add divs to the content
 	$return = '<div class="span3">';
 	$return .= do_shortcode( $content );
@@ -122,12 +90,6 @@ function three_fourth_column( $atts, $content = null) {
 	//remove wrong nested <p>
 	$content = remove_invalid_tags( $content, array('p') );
 
-	$content = wpautop( $content );
-
-	// Allow other shortcodes inside the column content.
-	if ( false !== strpos( $content, '[' ) )
-		$content = do_shortcode( shortcode_unautop( $content ) );
-
 	// add divs to the content
 	$return = '<div class="span9">';
 	$return .= do_shortcode( $content );
@@ -142,12 +104,6 @@ function one_sixth_column( $atts, $content = null ) {
 	//remove wrong nested <p>
 	$content = remove_invalid_tags( $content, array('p') );
 
-	$content = wpautop( $content );
-
-	// Allow other shortcodes inside the column content.
-	if ( false !== strpos( $content, '[' ) )
-		$content = do_shortcode( shortcode_unautop( $content ) );
-
 	// add divs to the content
 	$return = '<div class="span2">';
 	$return .= do_shortcode( $content );
@@ -162,12 +118,6 @@ function five_sixth_column( $atts, $content = null ) {
 	//remove wrong nested <p>
 	$content = remove_invalid_tags( $content, array('p') );
 
-	$content = wpautop( $content );
-
-	// Allow other shortcodes inside the column content.
-	if ( false !== strpos( $content, '[' ) )
-		$content = do_shortcode( shortcode_unautop( $content ) );
-
 	// add divs to the content
 	$return = '<div class="span10">';
 	$return .= do_shortcode( $content );