Merge pull request #12 from thenewinquiry/1.0.13

1.0.13

includes/class-tni-core-shortcodes.php

@@ -25,9 +25,14 @@ class TNI_Core_Shortcodes {
     function __construct() {
         add_action( 'init', array( $this, 'register_shortcodes' ) );
 
-        if( function_exists( 'shortcode_ui_register_for_shortcode' ) ) {
-          $this->register_shortcode_ui();
-        }
+        /**
+         * Disable Shortcode UI integration until we can resolve issue of `<p>` tags being added when switching to visual editor
+         * @see Issue #13
+         * @see https://github.com/wp-shortcake/shortcake/issues/721
+         */
+        // if( function_exists( 'shortcode_ui_register_for_shortcode' ) ) {
+        //   $this->register_shortcode_ui();
+        // }
 
         add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_assets' ) );
     }
@@ -164,7 +169,7 @@ public function caption_shortcode( $attr, $content = null ) {
 
       ob_start(); ?>
 
-      <figcaption class="wp-caption-text"><?php echo esc_attr( $content ); ?></figcaption>
+      <figcaption class="wp-caption-text"><?php echo $content; ?></figcaption>
 
       <?php
       return ob_get_clean();
@@ -183,7 +188,7 @@ public function margin_left_shortcode( $attr, $content = null ) {
 
       ob_start(); ?>
 
-      <div class="margin-left"><?php echo esc_attr( $content ); ?></div>
+      <div class="margin-left"><?php echo $content; ?></div>
 
       <?php
       return ob_get_clean();
@@ -202,7 +207,7 @@ public function margin_right_shortcode( $attr, $content = null ) {
 
       ob_start(); ?>
 
-      <div class="margin-right"><?php echo esc_attr( $content ); ?></div>
+      <div class="margin-right"><?php echo $content; ?></div>
 
       <?php
       return ob_get_clean();

readme.txt

@@ -3,7 +3,7 @@ Contributors: misfist
 Tags: custom
 Requires at least: 4.7
 Tested up to: 4.7.2
-Version: 1.0.12
+Version: 1.0.13
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 
@@ -22,6 +22,10 @@ This section describes how to install the plugin and get it working.
 
 == Changelog ==
 
+= 1.0.13 =
+* #10 Remove escapes for caption and margin shortcodes since they can contain HTML tags
+* #13 Disable shortcode ui for shortcodes
+
 = 1.0.12 April 18, 2017 =
 * Added close button for login modal
 

tni-core-functionality.php

@@ -10,7 +10,7 @@
  * Text Domain:     tni-core
  * Domain Path:     /languages
  *
- * Version:         1.0.12
+ * Version:         1.0.13
  *
  * @package         Tni_Core_Functionality
  */
@@ -47,7 +47,7 @@
  * @return object Tni_Core
  */
 function Tni_Core() {
-	$instance = Tni_Core::instance( __FILE__, '1.0.12' );
+	$instance = Tni_Core::instance( __FILE__, '1.0.13' );
 
 	return $instance;
 }