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

- fixed nav-menu;

Browse Source
This commit is contained in:
denisbaranov
2018-04-12 22:44:07 +03:00
parent c5ecd077aa
commit f05216f5e9
2 changed files with 22 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
includes/core/class-access.php
+12 -5
View File
@@ -944,10 +944,6 @@ if ( ! class_exists( 'um\core\Access' ) ) {
if ( empty( $menu_items ) )
return $menu_items;
if ( current_user_can( 'administrator' ) ) {
return $menu_items;
}
$filtered_items = array();
//other filter
@@ -968,7 +964,13 @@ if ( ! class_exists( 'um\core\Access' ) ) {
$filtered_items[] = $menu_item;
continue;
} else {
//if not single query when exclude if set _um_access_hide_from_queries
if ( current_user_can( 'administrator' ) ) {
$filtered_items[] = $menu_item;
continue;
}
//if not single query when exclude if set _um_access_hide_from_queries
if ( empty( $restriction['_um_access_hide_from_queries'] ) ) {
$filtered_items[] = $menu_item;
continue;
@@ -978,6 +980,11 @@ if ( ! class_exists( 'um\core\Access' ) ) {
//if post for logged in users and user is not logged in
if ( is_user_logged_in() ) {
if ( current_user_can( 'administrator' ) ) {
$filtered_items[] = $menu_item;
continue;
}
$custom_restrict = $this->um_custom_restriction( $restriction );
if ( empty( $restriction['_um_access_roles'] ) || false === array_search( '1', $restriction['_um_access_roles'] ) ) {
includes/core/um-filters-navmenu.php
+10 -10
View File
@@ -39,10 +39,6 @@ if ( ! is_admin() ) {
return $menu_items;
}
if ( current_user_can( 'administrator' ) ) {
return $menu_items;
}
um_fetch_user( get_current_user_id() );
$filtered_items = array();
@@ -68,12 +64,16 @@ if ( ! is_admin() ) {
case 2:
if ( is_user_logged_in() && ! empty( $roles ) ) {
$current_user_roles = um_user( 'roles' );
if ( empty( $current_user_roles ) ) {
$visible = false;
} else {
$visible = ( count( array_intersect( $current_user_roles, (array)$roles ) ) > 0 ) ? true : false;
}
if ( current_user_can( 'administrator' ) ) {
$visible = true;
} else {
$current_user_roles = um_user( 'roles' );
if ( empty( $current_user_roles ) ) {
$visible = false;
} else {
$visible = ( count( array_intersect( $current_user_roles, (array)$roles ) ) > 0 ) ? true : false;
}
}
} else {
$visible = is_user_logged_in() ? true : false;
}