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 restriction logic;

Browse Source
This commit is contained in:
Nikita Sinelnikov
2021-08-25 13:31:38 +03:00
parent 773e7f26da
commit c28e0211f1
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
includes/admin/core/class-admin-metabox.php
+2 -2
View File
@@ -431,7 +431,7 @@ if ( ! class_exists( 'um\admin\core\Admin_Metabox' ) ) {
'0' => __( 'Show access restricted message', 'ultimate-member' ), '0' => __( 'Show access restricted message', 'ultimate-member' ),
'1' => __( 'Redirect user', 'ultimate-member' ), '1' => __( 'Redirect user', 'ultimate-member' ),
), ),
'conditional' => array( '_um_access_hide_from_queries', '=', '0' ), 'conditional' => UM()->options()->get( 'disable_restriction_pre_queries' ) ? '' : array( '_um_access_hide_from_queries', '=', '0' ),
), ),
array( array(
'id' => '_um_restrict_by_custom_message', 'id' => '_um_restrict_by_custom_message',
@@ -583,7 +583,7 @@ if ( ! class_exists( 'um\admin\core\Admin_Metabox' ) ) {
'0' => __( 'Show access restricted message', 'ultimate-member' ), '0' => __( 'Show access restricted message', 'ultimate-member' ),
'1' => __( 'Redirect user', 'ultimate-member' ), '1' => __( 'Redirect user', 'ultimate-member' ),
), ),
'conditional' => array( '_um_access_hide_from_queries', '=', '0' ), 'conditional' => UM()->options()->get( 'disable_restriction_pre_queries' ) ? '' : array( '_um_access_hide_from_queries', '=', '0' ),
), ),
array( array(
'id' => '_um_restrict_by_custom_message', 'id' => '_um_restrict_by_custom_message',
includes/admin/templates/access/restrict_content.php
+1 -1
View File
@@ -96,7 +96,7 @@ if ( ! defined( 'ABSPATH' ) ) {
'0' => __( 'Show access restricted message', 'ultimate-member' ), '0' => __( 'Show access restricted message', 'ultimate-member' ),
'1' => __( 'Redirect user', 'ultimate-member' ), '1' => __( 'Redirect user', 'ultimate-member' ),
), ),
'conditional' => array( '_um_access_hide_from_queries', '=', '0' ), 'conditional' => UM()->options()->get( 'disable_restriction_pre_queries' ) ? '' : array( '_um_access_hide_from_queries', '=', '0' ),
), ),
array( array(
'id' => '_um_restrict_by_custom_message', 'id' => '_um_restrict_by_custom_message',
includes/core/class-access.php
+4 -4
View File
@@ -1100,7 +1100,7 @@ if ( ! class_exists( 'um\core\Access' ) ) {
continue; continue;
} else { } else {
$restriction_settings = $this->get_post_privacy_settings( $menu_item->object_id ); $restriction_settings = $this->get_post_privacy_settings( $menu_item->object_id );
if ( empty( $restriction_settings['_um_access_hide_from_queries'] ) ) { if ( UM()->options()->get( 'disable_restriction_pre_queries' ) || empty( $restriction_settings['_um_access_hide_from_queries'] ) ) {
$filtered_items[] = $menu_item; $filtered_items[] = $menu_item;
continue; continue;
} }
@@ -1241,7 +1241,7 @@ if ( ! class_exists( 'um\core\Access' ) ) {
if ( is_object( $query ) && is_a( $query, '\WP_Query' ) && if ( is_object( $query ) && is_a( $query, '\WP_Query' ) &&
( $query->is_main_query() || ! empty( $query->query_vars['um_main_query'] ) ) ) { ( $query->is_main_query() || ! empty( $query->query_vars['um_main_query'] ) ) ) {
if ( $is_singular ) { if ( $is_singular ) {
if ( $this->is_restricted( $posts[0]->ID ) ) { if ( ! UM()->options()->get( 'disable_restriction_pre_queries' ) && $this->is_restricted( $posts[0]->ID ) ) {
$content_restriction = $this->get_post_privacy_settings( $posts[0]->ID ); $content_restriction = $this->get_post_privacy_settings( $posts[0]->ID );
if ( ! empty( $content_restriction['_um_access_hide_from_queries'] ) ) { if ( ! empty( $content_restriction['_um_access_hide_from_queries'] ) ) {
unset( $posts[0] ); unset( $posts[0] );
@@ -1276,7 +1276,7 @@ if ( ! class_exists( 'um\core\Access' ) ) {
} else { } else {
if ( $is_singular ) { if ( $is_singular ) {
if ( ! isset( $restriction['_um_noaccess_action'] ) || '0' == $restriction['_um_noaccess_action'] ) { if ( ! isset( $restriction['_um_noaccess_action'] ) || '0' == $restriction['_um_noaccess_action'] ) {
if ( empty( $restriction['_um_access_hide_from_queries'] ) ) { if ( UM()->options()->get( 'disable_restriction_pre_queries' ) || empty( $restriction['_um_access_hide_from_queries'] ) ) {
/** /**
* UM hook * UM hook
* *
@@ -1318,7 +1318,7 @@ if ( ! class_exists( 'um\core\Access' ) ) {
} }
} }
} else { } else {
if ( empty( $restriction['_um_access_hide_from_queries'] ) ) { if ( UM()->options()->get( 'disable_restriction_pre_queries' ) || empty( $restriction['_um_access_hide_from_queries'] ) ) {
$filtered_posts[] = $post; $filtered_posts[] = $post;
continue; continue;
} }