10h30/ultimatemember
1
0
Fork 0
mirror of https://github.com/10h30/ultimatemember.git synced 2026-07-15 04:37:00 +09:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
nikitasinelnikov
2020-05-25 17:37:49 +03:00
parent 421f22fe3f 523e00133a
commit 073a9bc329
5 changed files with 74 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
includes/admin/core/class-admin-builder.php
+6 -1
View File
@@ -1055,7 +1055,12 @@ if ( ! class_exists( 'um\admin\core\Admin_Builder' ) ) {
}
$output = '<div class="um-admin-preview-overlay"></div>';
$output .= do_shortcode('[ultimatemember form_id="' . $arg1 . '" /]');
if ( version_compare( get_bloginfo('version'),'5.4', '<' ) ) {
$output .= do_shortcode('[ultimatemember form_id="' . $arg1 . '" /]');
} else {
$output .= apply_shortcodes('[ultimatemember form_id="' . $arg1 . '" /]');
}
break;
includes/core/class-fields.php
+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 */
includes/core/class-shortcodes.php
+45 -9
View File
@@ -374,7 +374,11 @@ if ( ! class_exists( 'um\core\Shortcodes' ) ) {
UM()->get_template( 'login-to-view.php', '', $args, true );
}
} else {
echo do_shortcode( $this->convert_locker_tags( wpautop( $content ) ) );
if ( version_compare( get_bloginfo('version'),'5.4', '<' ) ) {
echo do_shortcode( $this->convert_locker_tags( wpautop( $content ) ) );
} else {
echo apply_shortcodes( $this->convert_locker_tags( wpautop( $content ) ) );
}
}
$output = ob_get_clean();
@@ -398,7 +402,11 @@ if ( ! class_exists( 'um\core\Shortcodes' ) ) {
if ( is_user_logged_in() ) {
echo '';
} else {
echo do_shortcode( wpautop( $content ) );
if ( version_compare( get_bloginfo('version'),'5.4', '<' ) ) {
echo do_shortcode( wpautop( $content ) );
} else {
echo apply_shortcodes( wpautop( $content ) );
}
}
$output = ob_get_clean();
@@ -431,7 +439,11 @@ if ( ! class_exists( 'um\core\Shortcodes' ) ) {
$shortcode_attrs .= " {$key}=\"{$value}\"";
}
return do_shortcode( "[ultimatemember {$shortcode_attrs} /]" );
if ( version_compare( get_bloginfo('version'),'5.4', '<' ) ) {
return do_shortcode( "[ultimatemember {$shortcode_attrs} /]" );
} else {
return apply_shortcodes( "[ultimatemember {$shortcode_attrs} /]" );
}
}
@@ -460,7 +472,11 @@ if ( ! class_exists( 'um\core\Shortcodes' ) ) {
$shortcode_attrs .= " {$key}=\"{$value}\"";
}
return do_shortcode( "[ultimatemember {$shortcode_attrs} /]" );
if ( version_compare( get_bloginfo('version'),'5.4', '<' ) ) {
return do_shortcode( "[ultimatemember {$shortcode_attrs} /]" );
} else {
return apply_shortcodes( "[ultimatemember {$shortcode_attrs} /]" );
}
}
@@ -490,7 +506,11 @@ if ( ! class_exists( 'um\core\Shortcodes' ) ) {
$shortcode_attrs .= " {$key}=\"{$value}\"";
}
return do_shortcode( "[ultimatemember {$shortcode_attrs} /]" );
if ( version_compare( get_bloginfo('version'),'5.4', '<' ) ) {
return do_shortcode( "[ultimatemember {$shortcode_attrs} /]" );
} else {
return apply_shortcodes( "[ultimatemember {$shortcode_attrs} /]" );
}
}
@@ -520,7 +540,11 @@ if ( ! class_exists( 'um\core\Shortcodes' ) ) {
$shortcode_attrs .= " {$key}=\"{$value}\"";
}
return do_shortcode( "[ultimatemember {$shortcode_attrs} /]" );
if ( version_compare( get_bloginfo('version'),'5.4', '<' ) ) {
return do_shortcode( "[ultimatemember {$shortcode_attrs} /]" );
} else {
return apply_shortcodes( "[ultimatemember {$shortcode_attrs} /]" );
}
}
@@ -1152,20 +1176,32 @@ if ( ! class_exists( 'um\core\Shortcodes' ) ) {
$current_user_roles = um_user( 'roles' );
if ( ! empty( $a['not'] ) && ! empty( $a['roles'] ) ) {
return do_shortcode( $this->convert_locker_tags( $content ) );
if ( version_compare( get_bloginfo('version'),'5.4', '<' ) ) {
return do_shortcode( $this->convert_locker_tags( $content ) );
} else {
return apply_shortcodes( $this->convert_locker_tags( $content ) );
}
}
if ( ! empty( $a['not'] ) ) {
$not_in_roles = explode( ",", $a['not'] );
if ( is_array( $not_in_roles ) && ( empty( $current_user_roles ) || count( array_intersect( $current_user_roles, $not_in_roles ) ) <= 0 ) ) {
return do_shortcode( $this->convert_locker_tags( $content ) );
if ( version_compare( get_bloginfo('version'),'5.4', '<' ) ) {
return do_shortcode( $this->convert_locker_tags( $content ) );
} else {
return apply_shortcodes( $this->convert_locker_tags( $content ) );
}
}
} else {
$roles = explode( ",", $a['roles'] );
if ( ! empty( $current_user_roles ) && is_array( $roles ) && count( array_intersect( $current_user_roles, $roles ) ) > 0 ) {
return do_shortcode( $this->convert_locker_tags( $content ) );
if ( version_compare( get_bloginfo('version'),'5.4', '<' ) ) {
return do_shortcode( $this->convert_locker_tags( $content ) );
} else {
return apply_shortcodes( $this->convert_locker_tags( $content ) );
}
}
}
includes/um-deprecated-functions.php
+5 -1
View File
@@ -451,7 +451,11 @@ function um_members( $argument ) {
function um_get_search_form() {
//um_deprecated_function( 'um_get_search_form', '2.1.0', 'do_shortcode( \'[ultimatemember_searchform]\' )' );
return do_shortcode( '[ultimatemember_searchform]' );
if ( version_compare( get_bloginfo('version'),'5.4', '<' ) ) {
return do_shortcode( '[ultimatemember_searchform]' );
} else {
return apply_shortcodes( '[ultimatemember_searchform]' );
}
}
includes/widgets/class-um-search-widget.php
+6 -1
View File
@@ -50,7 +50,12 @@ class UM_Search_Widget extends \WP_Widget {
}
// display the search form
echo do_shortcode( '[ultimatemember_searchform /]' );
if ( version_compare( get_bloginfo('version'),'5.4', '<' ) ) {
echo do_shortcode( '[ultimatemember_searchform /]' );
} else {
echo apply_shortcodes( '[ultimatemember_searchform /]' );
}
echo $args['after_widget'];
}