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

- fixed #1077;

Browse Source
This commit is contained in:
Nikita Sinelnikov
2022-10-10 17:57:44 +03:00
parent 5db8232202
commit c8fac38bb9
1 changed files with 19 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
includes/core/um-filters-navmenu.php
+19 -16
View File
@@ -20,13 +20,13 @@ if ( ! is_admin() ) {
} }
foreach ( $sorted_menu_items as &$menu_item ) { foreach ( $sorted_menu_items as &$menu_item ) {
if ( $menu_item->title ) { if ( ! empty( $menu_item->title ) ) {
$menu_item->title = UM()->shortcodes()->convert_user_tags( $menu_item->title ); $menu_item->title = UM()->shortcodes()->convert_user_tags( $menu_item->title );
} }
if ( $menu_item->attr_title ) { if ( ! empty( $menu_item->attr_title ) ) {
$menu_item->attr_title = UM()->shortcodes()->convert_user_tags( $menu_item->attr_title ); $menu_item->attr_title = UM()->shortcodes()->convert_user_tags( $menu_item->attr_title );
} }
if ( $menu_item->description ) { if ( ! empty( $menu_item->description ) ) {
$menu_item->description = UM()->shortcodes()->convert_user_tags( $menu_item->description ); $menu_item->description = UM()->shortcodes()->convert_user_tags( $menu_item->description );
} }
} }
@@ -56,19 +56,22 @@ if ( ! is_admin() ) {
um_fetch_user( get_current_user_id() ); um_fetch_user( get_current_user_id() );
$filtered_items = array(); $filtered_items = array();
$hide_children_of = array(); $hide_children_of = array();
//other filter //other filter
foreach ( $menu_items as $item ) { foreach ( $menu_items as $item ) {
if ( empty( $item->ID ) ) {
continue;
}
$mode = get_post_meta( $item->ID, 'menu-item-um_nav_public', true ); $mode = get_post_meta( $item->ID, 'menu-item-um_nav_public', true );
$roles = get_post_meta( $item->ID, 'menu-item-um_nav_roles', true ); $roles = get_post_meta( $item->ID, 'menu-item-um_nav_roles', true );
$visible = true; $visible = true;
// hide any item that is the child of a hidden item // hide any item that is the child of a hidden item
if ( in_array( $item->menu_item_parent, $hide_children_of ) ) { if ( isset( $item->menu_item_parent ) && in_array( $item->menu_item_parent, $hide_children_of ) ) {
$visible = false; $visible = false;
$hide_children_of[] = $item->ID; // for nested menus $hide_children_of[] = $item->ID; // for nested menus
} }
@@ -79,16 +82,16 @@ if ( ! is_admin() ) {
case 2: case 2:
if ( is_user_logged_in() && ! empty( $roles ) ) { if ( is_user_logged_in() && ! empty( $roles ) ) {
if ( current_user_can( 'administrator' ) ) { if ( current_user_can( 'administrator' ) ) {
$visible = true; $visible = true;
} else { } else {
$current_user_roles = um_user( 'roles' ); $current_user_roles = um_user( 'roles' );
if ( empty( $current_user_roles ) ) { if ( empty( $current_user_roles ) ) {
$visible = false; $visible = false;
} else { } else {
$visible = ( count( array_intersect( $current_user_roles, (array)$roles ) ) > 0 ) ? true : false; $visible = ( count( array_intersect( $current_user_roles, (array)$roles ) ) > 0 ) ? true : false;
} }
} }
} else { } else {
$visible = is_user_logged_in() ? true : false; $visible = is_user_logged_in() ? true : false;
} }