';
- $html .= do_shortcode($content);
+ $html .= apply_filters( 'the_content', $content);
$html .= '
';
- $html .= do_shortcode($content);
+ $html .= apply_filters( 'the_content', $content);
$html .= '
';
return $html;
diff --git a/shortcodes/abbr.php b/shortcodes/abbr.php
index 413e694..ddf7edb 100644
--- a/shortcodes/abbr.php
+++ b/shortcodes/abbr.php
@@ -1,7 +1,7 @@
'.$content.'';
}
?>
\ No newline at end of file
diff --git a/shortcodes/accordion.php b/shortcodes/accordion.php
index 0124322..c17a1a5 100644
--- a/shortcodes/accordion.php
+++ b/shortcodes/accordion.php
@@ -13,7 +13,7 @@ function curly_accordion( $atts, $content = null ) {
$GLOBALS['accordionPanelID'] = $GLOBALS['accordionID'] * 100;
$html = '';
- $html .= do_shortcode($content).'
';
+ $html .= apply_filters( 'the_content', $content).'';
return $html;
}
@@ -30,7 +30,7 @@ function curly_toggle( $atts, $content = null ) {
// Global Panel ID
$GLOBALS['accordionPanelID']++;
- if ( $opened == "yes" ) {
+ if ( filter_var( $opened, FILTER_VALIDATE_BOOLEAN ) === true ) {
$opened = ' in';
$collapsed = null;
} else {
@@ -45,7 +45,7 @@ function curly_toggle( $atts, $content = null ) {
$html .= '';
$html .= '';
$html .= '';
+ '.apply_filters( 'the_content', $content).'
';
$html .= '';
}
diff --git a/shortcodes/action.php b/shortcodes/action.php
index 37942ac..83c4a4c 100644
--- a/shortcodes/action.php
+++ b/shortcodes/action.php
@@ -5,24 +5,27 @@ function curly_action( $atts, $content = null ) {
extract(shortcode_atts(array(
'title' => null,
'button' => null,
+ 'button_vc' => null,
'link' => null,
'style' => null
), $atts));
- switch ( $style ) {
- case '1' : $style = ' style-1'; break;
- case '2' : $style = ' style-2'; break;
- case '3' : $style = ' style-3'; break;
- case '4' : $style = ' style-4'; break;
- case '5' : $style = ' style-5'; break;
+ switch ( intval( $style ) ) {
+ case 1 : $style = ' style-1'; break;
+ case 2 : $style = ' style-2'; break;
+ case 3 : $style = ' style-3'; break;
+ case 4 : $style = ' style-4'; break;
+ case 5 : $style = ' style-5'; break;
default: $style = null; break;
}
+
+ $button = ! is_null( $button_vc ) ? $button_vc : $button;
$html = '
- '.do_shortcode($content).'
';
- $html .= ($button) ? do_shortcode('[button link="'.$link.'" size="large" class="hidden-xs"]'.$button.'[/button]') : null ;
- $html .= ($title) ? '
';
return $html;
diff --git a/shortcodes/agenda.php b/shortcodes/agenda.php
index 8e162ac..cfbdfd8 100644
--- a/shortcodes/agenda.php
+++ b/shortcodes/agenda.php
@@ -7,6 +7,7 @@ function curly_agenda( $atts, $content = null ) {
}
add_shortcode("event-day", "curly_day");
+add_shortcode("event_day", "curly_day");
function curly_day( $atts, $content = null ) {
extract(shortcode_atts(array(
@@ -38,7 +39,7 @@ function curly_event( $atts, $content = null ) {
if ( $content || $room || $time ) {
$html .= ''.$title.'
' : null; - $html .= do_shortcode($content); - $html .= ($button) ? do_shortcode('[button link="'.$link.'" class="visible-xs btn-large btn-block btn-default"]'.$button.'[/button]') : null; + $html .= $button ? do_shortcode('[button link="'.$link.'" size="large" class="hidden-xs"]'.$button.'[/button]') : null ; + $html .= $title ? ''.$title.'
' : null; + $html .= apply_filters( 'the_content', $content ); + $html .= $button ? do_shortcode('[button link="'.$link.'" class="visible-xs btn-large btn-block btn-default"]'.$button.'[/button]') : null; $html .= '';
$html .= ( $time ) ? ' '.$time.'' : null;
- $html .= ( $content ) ? '
';
}
diff --git a/shortcodes/boxes.php b/shortcodes/boxes.php
index 2355f14..b70e64d 100644
--- a/shortcodes/boxes.php
+++ b/shortcodes/boxes.php
@@ -12,34 +12,34 @@ function curly_box( $atts, $content = null ) {
$css = ( $background ) ? 'style="background-color: '.$background.'"' : null;
- switch ( $style ) {
- case '1' : {
+ switch ( intval( $style ) ) {
+ case 1 : {
$html .= ''.do_shortcode($content).'
' : null;
+ $html .= ( $content ) ? ''.apply_filters( 'the_content', $content).'
' : null;
$html .= ( $room ) ? ''.$room.' ' : null;
$html .= '';
$html .= do_shortcode($content);
$html .= '
';
} break;
- case '2' : {
+ case 2 : {
$html .= '';
$html .= ( $icon ) ? do_shortcode('[icon icon="'.$icon.'" boxed="yes" position="left"]') : null;
$html .= ( $title ) ? '
';
} break;
- case '3' : {
+ case 3 : {
$html .= ''.$title.'
' : null; $html .= do_shortcode($content); $html .= '';
$html .= ( $icon ) ? do_shortcode('[icon icon="'.$icon.'" size="3x" boxed="yes" bg="transparent"]') : null;
$html .= ( $title ) ? '
';
} break;
- case '4' : {
+ case 4 : {
$html .= ''.$title.'
' : null; $html .= do_shortcode($content); $html .= '';
$html .= ( $icon ) ? do_shortcode('[icon icon="'.$icon.'" boxed="yes"]') : null;
$html .= ( $title ) ? '
';
} break;
- case '5' : {
+ case 6 : {
$html .= ''.$title.'
' : null; $html .= do_shortcode($content); $html .= '';
$html .= ( $icon ) ? do_shortcode('[icon icon="'.$icon.'" boxed="yes" size="4x"]') : null;
$html .= '
';
diff --git a/shortcodes/buttons.php b/shortcodes/buttons.php
index 2b8eca7..c553afc 100644
--- a/shortcodes/buttons.php
+++ b/shortcodes/buttons.php
@@ -36,6 +36,6 @@ function curly_buttons( $atts, $content = null ) {
$rel_val = ( isset($rel) ) ? 'rel="'.$rel.'"' : null;
// Return
- return ''.do_shortcode( $content ).'';
+ return ''.do_shortcode($content).'';
}
?>
\ No newline at end of file
diff --git a/shortcodes/client-list.php b/shortcodes/client-list.php
index 82caeb8..de93f30 100644
--- a/shortcodes/client-list.php
+++ b/shortcodes/client-list.php
@@ -10,7 +10,7 @@ function curly_clients( $atts, $content = null ) {
$GLOBALS['rand_carousel'] = ( isset($GLOBALS['rand_carousel']) ) ? + 1 : 0;
$rand_carousel = 'carousel-'.$GLOBALS['rand_carousel'];
- $html = '';
+ $html = '';
$html .= '';
$html .= '';
$html .= '
- '.do_shortcode($content).'
- '.apply_filters( 'the_content', $content).'
diff --git a/shortcodes/columns.php b/shortcodes/columns.php
index 6cc8709..206377b 100644
--- a/shortcodes/columns.php
+++ b/shortcodes/columns.php
@@ -22,8 +22,8 @@ function curly_column( $atts, $content = null ) {
}
$inline = ($margin != null) ? ' style="margin-bottom: '.$margin.'px" ' : null;
-
- return ( $last == 'yes' ) ? '
'.do_shortcode($content).'
' : ''.do_shortcode($content).'
';
+ $content = function_exists( 'wpb_js_remove_wpautop' ) ? wpb_js_remove_wpautop( $content, true ) : $content;
+ return ( $last == 'yes' ) ? ''.apply_filters( 'the_content', $content).'
' : ''.apply_filters( 'the_content', $content).'
';
}
?>
\ No newline at end of file
diff --git a/shortcodes/dividers.php b/shortcodes/dividers.php
index 9877a40..8502bb4 100644
--- a/shortcodes/dividers.php
+++ b/shortcodes/dividers.php
@@ -10,12 +10,12 @@ function curly_dividers( $atts, $content = null ) {
$css = 'divider';
- switch ($style){
- case '1' : $css .= ' one'; break;
- case '2' : $css .= ' two'; break;
- case '3' : $css .= ' three'; break;
- case '4' : $css .= ' four'; break;
- case '5' : $css .= ' five'; break;
+ switch( intval( $style ) ){
+ case 1 : $css .= ' one'; break;
+ case 2 : $css .= ' two'; break;
+ case 3 : $css .= ' three'; break;
+ case 4 : $css .= ' four'; break;
+ case 5 : $css .= ' five'; break;
}
$inline = null;
diff --git a/shortcodes/fullwidth.php b/shortcodes/fullwidth.php
index 3dda7fb..f3305ab 100644
--- a/shortcodes/fullwidth.php
+++ b/shortcodes/fullwidth.php
@@ -36,7 +36,7 @@ function curly_fullwidthbox( $atts, $content = null ) {
$html = '';
diff --git a/shortcodes/highlight.php b/shortcodes/highlight.php
index a31fd7a..a48900d 100644
--- a/shortcodes/highlight.php
+++ b/shortcodes/highlight.php
@@ -16,7 +16,7 @@ function curly_highlight( $atts, $content = null ) {
default : $style = null;
}
- return '' : null;
+ return ( $content ) ? '' : null;
}
-add_shortcode("pricing-row", "curly_pricing_table_row");
+add_shortcode("pricing-row", "curly_pricing_table_row");
+add_shortcode("curly_pricing_row", "curly_pricing_table_row");
function curly_pricing_table_row( $atts, $content = null ) {
return ( $content ) ? ''.$content.'' : null;
}
-add_shortcode("pricing-footer", "curly_pricing_table_footer");
+add_shortcode("pricing-footer", "curly_pricing_table_footer");
+add_shortcode("curly_pricing_footer", "curly_pricing_table_footer");
function curly_pricing_table_footer( $atts, $content = null ) {
return ( $content ) ? '' : null;
diff --git a/shortcodes/quotes.php b/shortcodes/quotes.php
index 18add36..e6aff94 100644
--- a/shortcodes/quotes.php
+++ b/shortcodes/quotes.php
@@ -9,7 +9,7 @@ function curly_blockquote( $atts, $content = null ) {
), $atts));
$img = ( $image ) ? '' : null;
-
- return ( $content ) ? '
'.do_shortcode($content).'
';
+ return ''.apply_filters( 'the_content', $content).'
';
}
?>
\ No newline at end of file
diff --git a/shortcodes/lists.php b/shortcodes/lists.php
index 0a23da1..97fec03 100644
--- a/shortcodes/lists.php
+++ b/shortcodes/lists.php
@@ -17,8 +17,10 @@ function curly_lists( $atts, $content = null ) {
case 'none' : $css = 'list-none'; break;
default : $css = 'list-none';
}
+
+ $content = function_exists( 'wpb_js_remove_wpautop' ) ? wpb_js_remove_wpautop( $content, true ) : $content;
- return ''.do_shortcode($content).'
';
+ return ''.apply_filters( 'the_content', $content ).'
';
}
?>
\ No newline at end of file
diff --git a/shortcodes/map-maker.php b/shortcodes/map-maker.php
index 1951138..80221df 100644
--- a/shortcodes/map-maker.php
+++ b/shortcodes/map-maker.php
@@ -38,7 +38,7 @@ function curly_mapmaker( $atts, $content = null ) {
if ( $content ) {
$markers = 'marker:{
- values:['.do_shortcode( $content ).'],
+ values:['.apply_filters( 'the_content', $content ).'],
events:{
mouseover: function(marker, event, context){
var map = jQuery(this).gmap3("get"),
diff --git a/shortcodes/marker.php b/shortcodes/marker.php
index ed9a1e2..c2e7156 100644
--- a/shortcodes/marker.php
+++ b/shortcodes/marker.php
@@ -15,7 +15,7 @@ function curly_marker( $atts, $content = null ) {
default : $css = 'label-primary';
}
- return ''.do_shortcode($content).'';
+ return ''.apply_filters( 'the_content', $content).'';
}
diff --git a/shortcodes/person.php b/shortcodes/person.php
index d88a785..d0a2008 100644
--- a/shortcodes/person.php
+++ b/shortcodes/person.php
@@ -16,23 +16,26 @@ function curly_person( $atts, $content = null ) {
$html = '';
+ $style = is_null( $style ) ? 'normal' : $style;
+ $picture = is_numeric( $picture ) ? wp_get_attachment_url( $picture ) : $picture;
+ $content = function_exists( 'wpb_js_remove_wpautop' ) ? wpb_js_remove_wpautop( $content, true ) : $content;
if ( $style ) {
if($style == 'mini') {
$html .= ( $picture ) ? '
' : null;
$html .= '
';
+ return '';
$html .= ( $name ) ? ''.$name.'
' : null; $html .= ( $position ) ? $position.'
' : null; - $html .= ( $content ) ? do_shortcode($content) : null; + $html .= ( $content ) ? apply_filters( 'the_content', $content) : null; $html .= '
';
} else{
$html .= ( $picture ) ? '' : null; $html .= ( $position ) ? $position.'
' : null; - $html .= ( $content ) ? do_shortcode($content) : null; + $html .= ( $content ) ? apply_filters( 'the_content', $content) : null; $html .= '
';
$html .= ( $name ) ? '
' : null; - $html .= ( $content ) ? '
';
+ return ''.$name.'
' : null; $html .= ( $position ) ? $position.'' : null; - $html .= ( $content ) ? '
'.do_shortcode($content).'
' : null; + $html .= ( $content ) ? ''.apply_filters( 'the_content', $content).'
' : null; $html .= ( $facebook || $twitter || $linkedin || $email ) ? '' : null; $html .= ( $facebook ) ? ''.do_shortcode('[icon icon="facebook" boxed="yes"]').' ' : null; - $html .= ( $twitter ) ? ''.do_shortcode('[icon icon="twitter" boxed="yes"]').' ' : null; + $html .= ( $twitter ) ? ''.do_shortcode( '[icon icon="twitter" boxed="yes"]').' ' : null; $html .= ( $linkedin ) ? ''.do_shortcode('[icon icon="linkedin" boxed="yes"]').' ' : null; $html .= ( $email ) ? ''.do_shortcode('[icon icon="envelope" boxed="yes"]').' ' : null; $html .= ( $facebook || $twitter || $linkedin || $email ) ? '
' : null; diff --git a/shortcodes/photo-frame.php b/shortcodes/photo-frame.php index 046babe..1422b4a 100644 --- a/shortcodes/photo-frame.php +++ b/shortcodes/photo-frame.php @@ -1,6 +1,6 @@ '.do_shortcode($content).''.apply_filters( 'the_content', $content ).'
';
}
?>
\ No newline at end of file
diff --git a/shortcodes/pretty-photo.php b/shortcodes/pretty-photo.php
index f0998de..930e215 100644
--- a/shortcodes/pretty-photo.php
+++ b/shortcodes/pretty-photo.php
@@ -11,7 +11,7 @@ function curly_prettyphoto( $atts, $content = null ) {
$display = ( $visible == 'no' ) ? ' style="display:none"' : null;
- return ''.do_shortcode($content).'';
+ return ''.apply_filters( 'the_content', $content).'';
}
diff --git a/shortcodes/pricing.php b/shortcodes/pricing.php
index 98074c0..fc16f63 100644
--- a/shortcodes/pricing.php
+++ b/shortcodes/pricing.php
@@ -1,5 +1,6 @@
'.do_shortcode($content).''.apply_filters( 'the_content', $content).'
';
}
-add_shortcode("pricing-header", "curly_pricing_table_header");
+add_shortcode("pricing-header", "curly_pricing_table_header");
+add_shortcode("curly_pricing_header", "curly_pricing_table_header");
function curly_pricing_table_header( $atts, $content = null ) {
extract(shortcode_atts(array(
@@ -32,7 +34,9 @@ function curly_pricing_table_header( $atts, $content = null ) {
return $html;
}
-add_shortcode("pricing-column", "curly_pricing_table_column");
+add_shortcode("pricing-column", "curly_pricing_table_column");
+add_shortcode("curly_pricing_column", "curly_pricing_table_column");
+
function curly_pricing_table_column( $atts, $content = null ) {
extract(shortcode_atts(array(
@@ -50,20 +54,22 @@ function curly_pricing_table_column( $atts, $content = null ) {
default : $css .= ' one-four';
}
- $css .= ( $highlight == "yes" ) ? " highlight-column" : null;
+ $css .= ( filter_var( $highlight, FILTER_VALIDATE_BOOLEAN ) === true ) ? " highlight-column" : null;
$css .= ( $last == "yes" ) ? " last" : null;
- return ( $content ) ? ''.do_shortcode($content).'
'.apply_filters( 'the_content', $content).'
'.$img.$content.( ( $cite ) ? ''.$cite.'' : null ).'' : null; + //$content = function_exists( 'wpb_js_remove_wpautop' ) ? wpb_js_remove_wpautop( $content, true ) : $content; + return ( $content ) ? '
' . $img . do_shortcode( $content ) . ( $cite ? ''.$cite . '' : null ) . '' : null; } ?> \ No newline at end of file diff --git a/shortcodes/slider-ios.php b/shortcodes/slider-ios.php index bad2bd9..6a14239 100644 --- a/shortcodes/slider-ios.php +++ b/shortcodes/slider-ios.php @@ -19,7 +19,7 @@ function curly_iosslider( $atts, $content = null ) { $html = '