Release 0.6.9

Author: Stefan van den Dungen Gronovius

column-shortcodes.php

@@ -2,7 +2,7 @@
 
 /*
 Plugin Name: 	Column Shortcodes
-Version: 		0.6.8
+Version: 		0.6.9
 Description: 	Adds shortcodes to easily create columns in your posts or pages
 Author: 		Codepress
 Author URI: 	http://www.codepresshq.com/
@@ -27,7 +27,7 @@
 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
-define( 'CPSH_VERSION', '0.6.8' );
+define( 'CPSH_VERSION', '0.6.9' );
 define( 'CPSH_URL', plugins_url( '', __FILE__ ) );
 define( 'CPSH_TEXTDOMAIN', 'column-shortcodes' );
 
@@ -184,12 +184,10 @@ function columns( $atts, $content = null, $name = '' ) {
 			}
 
 			// wraps the content in an extra div with padding applied
-			$content = '<div style="' . esc_attr( $padding ) . '">' . wpautop( $content ) . '</div>';
-		}
-		else {
-			$content = wpautop( $content );
+			$content = '<div style="' . esc_attr( $padding ) . '">' . $content . '</div>';
 		}
 
+
 		// last class
 		$pos = strpos( $name, '_last' );
 

readme.txt

@@ -259,6 +259,9 @@ You will find a .po file in the languages folder which you can use. You can send
 
 == Changelog ==
 
+= 0.6.9 =
+* [Fixed] Rollback of the auto paragraphs. Too much conflicts with other shortcodes
+
 = 0.6.8 =
 * [Fixed] use wpautop() to wrap content in paragraphs when needed