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

- code refactoring;

Browse Source
This commit is contained in:
nikitasinelnikov
2019-03-21 16:52:26 +02:00
parent b0b57116a8
commit 7d03ee61f1
1 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
includes/core/class-access.php
+16 -12
View File
@@ -556,10 +556,11 @@ if ( ! class_exists( 'um\core\Access' ) ) {
$restriction = get_post_meta( $post->ID, 'um_content_restriction', true );
if ( ! empty( $restriction['_um_custom_access_settings'] ) ) {
if ( ! isset( $restriction['_um_accessible'] ) )
if ( ! isset( $restriction['_um_accessible'] ) ) {
return false;
else
} else {
return $restriction;
}
}
}
@@ -573,8 +574,9 @@ if ( ! class_exists( 'um\core\Access' ) ) {
$terms = array();
if ( ! empty( $taxonomies ) ) {
foreach ( $taxonomies as $taxonomy ) {
if ( empty( $restricted_taxonomies[$taxonomy] ) )
if ( empty( $restricted_taxonomies[ $taxonomy ] ) ) {
continue;
}
$terms = array_merge( $terms, wp_get_post_terms( $post->ID, $taxonomy, array( 'fields' => 'ids' ) ) );
}
@@ -585,10 +587,11 @@ if ( ! class_exists( 'um\core\Access' ) ) {
$restriction = get_term_meta( $term_id, 'um_content_restriction', true );
if ( ! empty( $restriction['_um_custom_access_settings'] ) ) {
if ( ! isset( $restriction['_um_accessible'] ) || '0' == $restriction['_um_accessible'] )
if ( ! isset( $restriction['_um_accessible'] ) || '0' == $restriction['_um_accessible'] ) {
continue;
else
} else {
return $restriction;
}
}
}
@@ -610,11 +613,18 @@ if ( ! class_exists( 'um\core\Access' ) ) {
$filtered_posts = array();
//if empty
if ( empty( $posts ) )
if ( empty( $posts ) ) {
return $posts;
}
$restricted_global_message = UM()->options()->get( 'restricted_access_message' );
if ( is_object( $query ) ) {
$is_singular = $query->is_singular();
} else {
$is_singular = ! empty( $query->is_singular ) ? true : false;
}
//other filter
foreach ( $posts as $post ) {
@@ -631,12 +641,6 @@ if ( ! class_exists( 'um\core\Access' ) ) {
continue;
}
if ( is_object( $query ) ) {
$is_singular = $query->is_singular();
} else {
$is_singular = ! empty( $query->is_singular ) ? true : false;
}
//post is private
if ( '0' == $restriction['_um_accessible'] ) {
$this->singular_page = true;