Merge remote-tracking branch 'remotes/origin/feature/apply_shortcodes'

This commit is contained in:
nikitasinelnikov
2020-05-25 17:37:49 +03:00
5 changed files with 74 additions and 14 deletions
+12 -2
View File
@@ -3578,8 +3578,13 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
case 'shortcode':
$content = str_replace( '{profile_id}', um_profile_id(), $content );
if ( version_compare( get_bloginfo('version'),'5.4', '<' ) ) {
$content = do_shortcode( $content );
} else {
$content = apply_shortcodes( $content );
}
$output .= '<div ' . $this->get_atts( $key, $classes, $conditional, $data ) . '>' . do_shortcode( $content ) . '</div>';
$output .= '<div ' . $this->get_atts( $key, $classes, $conditional, $data ) . '>' . $content . '</div>';
break;
/* Unlimited Group */
@@ -4102,8 +4107,13 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
case 'shortcode':
$content = str_replace( '{profile_id}', um_profile_id(), $content );
if ( version_compare( get_bloginfo('version'),'5.4', '<' ) ) {
$content = do_shortcode( $content );
} else {
$content = apply_shortcodes( $content );
}
$output .= '<div ' . $this->get_atts( $key, $classes, $conditional, $data ) . '>' . do_shortcode( $content ) . '</div>';
$output .= '<div ' . $this->get_atts( $key, $classes, $conditional, $data ) . '>' . $content . '</div>';
break;
/* Gap/Space */