From c8ca096d09608f662190c77d333fd5a988023d43 Mon Sep 17 00:00:00 2001 From: nikitozzzzzzz Date: Wed, 28 Mar 2018 11:25:27 +0300 Subject: [PATCH 1/2] - fixed Woocommerce checkout page when homepage is restricted; --- includes/core/class-access.php | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/includes/core/class-access.php b/includes/core/class-access.php index af2312b0..f7eb6a9b 100644 --- a/includes/core/class-access.php +++ b/includes/core/class-access.php @@ -567,7 +567,7 @@ if ( ! class_exists( 'um\core\Access' ) ) { * Restrict content new logic * * @param $posts - * @param $query + * @param \WP_Query $query * @return array */ function filter_protected_posts( $posts, $query ) { @@ -581,6 +581,13 @@ if ( ! class_exists( 'um\core\Access' ) ) { //other filter foreach ( $posts as $post ) { + + //Woocommerce AJAX fixes....remove filtration on wc-ajax which goes to Front Page + if ( ! empty( $_GET['wc-ajax'] ) /*&& $query->is_front_page()*/ ) { + $filtered_posts[] = $post; + continue; + } + $restriction = $this->get_post_privacy_settings( $post ); if ( ! $restriction ) { @@ -588,6 +595,8 @@ if ( ! class_exists( 'um\core\Access' ) ) { continue; } + $is_singular = $query->is_singular(); + //post is private if ( '0' == $restriction['_um_accessible'] ) { $filtered_posts[] = $post; @@ -604,7 +613,7 @@ if ( ! class_exists( 'um\core\Access' ) ) { continue; } - if ( empty( $query->is_singular ) ) { + if ( empty( $is_singular ) ) { //if not single query when exclude if set _um_access_hide_from_queries if ( empty( $restriction['_um_access_hide_from_queries'] ) ) { @@ -703,7 +712,7 @@ if ( ! class_exists( 'um\core\Access' ) ) { } } - if ( empty( $query->is_singular ) ) { + if ( empty( $is_singular ) ) { //if not single query when exclude if set _um_access_hide_from_queries if ( empty( $restriction['_um_access_hide_from_queries'] ) ) { @@ -790,7 +799,7 @@ if ( ! class_exists( 'um\core\Access' ) ) { } } else { - if ( empty( $query->is_singular ) ) { + if ( empty( $is_singular ) ) { if ( empty( $restriction['_um_access_hide_from_queries'] ) ) { if ( ! isset( $restriction['_um_noaccess_action'] ) || '0' == $restriction['_um_noaccess_action'] ) { From c990cf7adfae6dba351faeb656920c82862a7e74 Mon Sep 17 00:00:00 2001 From: nikitozzzzzzz Date: Wed, 28 Mar 2018 11:48:34 +0300 Subject: [PATCH 2/2] - fixed click handler for disabled buttons (File/Image upload); --- assets/js/um-modal.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/assets/js/um-modal.js b/assets/js/um-modal.js index b21431bb..54d45f87 100644 --- a/assets/js/um-modal.js +++ b/assets/js/um-modal.js @@ -69,7 +69,7 @@ jQuery(document).ready(function() { return false; }); - jQuery(document).on('click', '.um-finish-upload.file', function(){ + jQuery(document).on('click', '.um-finish-upload.file:not(.disabled)', function(){ var key = jQuery(this).attr('data-key'); var preview = jQuery(this).parents('.um-modal-body').find('.um-single-file-preview').html(); @@ -83,7 +83,7 @@ jQuery(document).ready(function() { jQuery('.um-single-file-preview[data-key='+key+']').parents('.um-field').find('input[type=hidden]').val( jQuery('.um-single-file-preview[data-key='+key+']').parents('.um-field').find('.um-single-fileinfo a').attr('href') ); }); - jQuery(document).on('click', '.um-finish-upload.image', function(){ + jQuery(document).on('click', '.um-finish-upload.image:not(.disabled)', function(){ var elem = jQuery(this); var key = jQuery(this).attr('data-key');