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

- fixed buffer echo and close;

Browse Source
This commit is contained in:
nikitozzzzzzz
2018-09-28 17:14:50 +03:00
parent ab1c321433
commit c177a7f870
4 changed files with 18 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
includes/admin/core/class-admin-builder.php
+6 -15
View File
@@ -305,8 +305,7 @@ if ( ! class_exists( 'um\admin\core\Admin_Builder' ) ) {
$this->show_builder();
$output = ob_get_contents();
ob_end_clean();
$output = ob_get_clean();
if(is_array($output)){ print_r($output); }else{ echo $output; } die;
}
@@ -817,9 +816,7 @@ if ( ! class_exists( 'um\admin\core\Admin_Builder' ) ) {
*/
do_action( "um_admin_ajax_modal_content__hook_{$act_id}" );
$output = ob_get_contents();
ob_end_clean();
$output = ob_get_clean();
break;
case 'um_admin_fonticon_selector':
@@ -836,8 +833,7 @@ if ( ! class_exists( 'um\admin\core\Admin_Builder' ) ) {
<?php } ?>
</div><div class="um-admin-clear"></div>
<?php $output = ob_get_contents();
ob_end_clean();
<?php $output = ob_get_clean();
break;
case 'um_admin_show_fields':
@@ -894,8 +890,7 @@ if ( ! class_exists( 'um\admin\core\Admin_Builder' ) ) {
</div>
<?php $output = ob_get_contents();
ob_end_clean();
<?php $output = ob_get_clean();
break;
case 'um_admin_edit_field_popup':
@@ -973,9 +968,7 @@ if ( ! class_exists( 'um\admin\core\Admin_Builder' ) ) {
}
$output = ob_get_contents();
ob_end_clean();
$output = ob_get_clean();
break;
case 'um_admin_new_field_popup':
@@ -1037,9 +1030,7 @@ if ( ! class_exists( 'um\admin\core\Admin_Builder' ) ) {
}
$output = ob_get_contents();
ob_end_clean();
$output = ob_get_clean();
break;
case 'um_admin_preview_form':
includes/admin/core/class-admin-forms.php
-1
View File
@@ -651,7 +651,6 @@ if ( ! class_exists( 'um\admin\core\Admin_Forms' ) ) {
);
$html = ob_get_clean();
return $html;
}
includes/core/class-query.php
+1 -2
View File
@@ -68,8 +68,7 @@ if ( ! class_exists( 'um\core\Query' ) ) {
*/
do_action( "um_ajax_load_posts__{$hook}", $args );
$output = ob_get_contents();
ob_end_clean();
$output = ob_get_clean();
die( $output );
}
includes/core/class-shortcodes.php
+11 -13
View File
@@ -385,14 +385,13 @@ if ( ! class_exists( 'um\core\Shortcodes' ) ) {
ob_start();
// Hide for logged in users
if (is_user_logged_in()) {
if ( is_user_logged_in() ) {
echo '';
} else {
echo do_shortcode(wpautop($content));
echo do_shortcode( wpautop( $content ) );
}
$output = ob_get_contents();
ob_end_clean();
$output = ob_get_clean();
return $output;
}
@@ -417,8 +416,6 @@ if ( ! class_exists( 'um\core\Shortcodes' ) ) {
* @return string
*/
function load( $args ) {
ob_start();
$defaults = array();
$args = wp_parse_args($args, $defaults);
@@ -436,6 +433,8 @@ if ( ! class_exists( 'um\core\Shortcodes' ) ) {
// get data into one global array
$post_data = UM()->query()->post_data($this->form_id);
ob_start();
/**
* UM hook
*
@@ -459,7 +458,7 @@ if ( ! class_exists( 'um\core\Shortcodes' ) ) {
*/
$args = apply_filters( 'um_pre_args_setup', $post_data );
if (!isset($args['template'])) {
if ( ! isset( $args['template'] ) ) {
$args['template'] = '';
}
@@ -515,6 +514,7 @@ if ( ! class_exists( 'um\core\Shortcodes' ) ) {
//not display on admin preview
if ( empty( $_POST['act_id'] ) || $_POST['act_id'] != 'um_admin_preview_form' ) {
if ( 'register' == $mode && is_user_logged_in() ) {
ob_get_clean();
return __( 'You are already registered', 'ultimate-member' );
}
}
@@ -529,10 +529,12 @@ if ( ! class_exists( 'um\core\Shortcodes' ) ) {
if ( ! empty( $args['role'] ) ) {
if ( is_array( $args['role'] ) ) {
if ( ! count( array_intersect( $args['role'], $current_user_roles ) ) ) {
ob_get_clean();
return '';
}
} else {
if ( ! in_array( $args['role'], $current_user_roles ) ) {
ob_get_clean();
return '';
}
}
@@ -628,8 +630,7 @@ if ( ! class_exists( 'um\core\Shortcodes' ) ) {
*/
do_action( 'um_after_everything_output' );
$output = ob_get_contents();
ob_end_clean();
$output = ob_get_clean();
return $output;
}
@@ -998,10 +999,7 @@ if ( ! class_exists( 'um\core\Shortcodes' ) ) {
$this->load_template( 'searchform' );
// get the buffer
$template = ob_get_contents();
// clear the buffer
ob_end_clean();
$template = ob_get_clean();
return $template;
}