From 571f2121739ffcef65f6da9d2e17ac831d00d24f Mon Sep 17 00:00:00 2001
From: nikitozzzzzzz <nsinelnikov.work@gmail.com>
Date: Wed, 11 Apr 2018 21:00:36 +0300
Subject: [PATCH] - hotfix for nav-menu items restriction content options;

---
 includes/core/class-access.php       | 4 ++++
 includes/core/class-shortcodes.php   | 2 +-
 includes/core/um-filters-navmenu.php | 4 ++++
 includes/core/um-navmenu.php         | 2 +-
 4 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/includes/core/class-access.php b/includes/core/class-access.php
index 914c6171..6a2b45b2 100644
--- a/includes/core/class-access.php
+++ b/includes/core/class-access.php
@@ -924,6 +924,10 @@ 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
diff --git a/includes/core/class-shortcodes.php b/includes/core/class-shortcodes.php
index 889c9499..c19853cb 100644
--- a/includes/core/class-shortcodes.php
+++ b/includes/core/class-shortcodes.php
@@ -161,7 +161,7 @@ if ( ! class_exists( 'um\core\Shortcodes' ) ) {
 
 					if ( ! empty( $role ) && ! empty( $role["status"] ) ) {
 						$message_key = $role["status"] . '_message';
-						$this->custom_message = ! empty( $role[ $message_key ] ) ? $role[ $message_key ] : '';
+						$this->custom_message = ! empty( $role[ $message_key ] ) ? stripslashes( $role[ $message_key ] ) : '';
 					}
 				}
 
diff --git a/includes/core/um-filters-navmenu.php b/includes/core/um-filters-navmenu.php
index 13cd43a8..ba03b095 100644
--- a/includes/core/um-filters-navmenu.php
+++ b/includes/core/um-filters-navmenu.php
@@ -36,6 +36,10 @@ if ( ! is_admin() ) {
 	 */
 	function um_conditional_nav_menu( $items, $menu, $args ) {
 
+		if ( current_user_can( 'administrator' ) ) {
+			return $items;
+		}
+
 		$hide_children_of = array();
 
 		um_fetch_user( get_current_user_id() );
diff --git a/includes/core/um-navmenu.php b/includes/core/um-navmenu.php
index 0840406e..e46b3a4b 100644
--- a/includes/core/um-navmenu.php
+++ b/includes/core/um-navmenu.php
@@ -152,7 +152,7 @@ if ( ! class_exists( 'UM_Menu_Item_Custom_Fields_Editor' ) ) {
 					<p class="description description-wide um-nav-roles" <# if( data.restriction_data.um_nav_public == '2' ){ #>style="display: block;"<# } #>>
 						<?php _e( "Select the member roles that can see this link", 'ultimate-member' ) ?><br/>
 
-						<?php $options = UM()->roles()->get_roles();
+						<?php $options = UM()->roles()->get_roles( false, array( 'administrator' ) );
 						$i = 0;
 						$html = '';
 						$columns = 2;