From 1ea4d8563661b035c29af87f9d7f6cc4ed3a2459 Mon Sep 17 00:00:00 2001
From: nikitozzzzzzz <nsinelnikov.work@gmail.com>
Date: Tue, 17 Apr 2018 11:15:21 +0300
Subject: [PATCH] - fixed fields privacy; - small notices fixes;

---
 includes/admin/core/class-admin-settings.php | 2 +-
 includes/core/um-filters-navmenu.php         | 3 ++-
 includes/um-short-functions.php              | 4 ++++
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/includes/admin/core/class-admin-settings.php b/includes/admin/core/class-admin-settings.php
index e97a8d32..ba23548a 100644
--- a/includes/admin/core/class-admin-settings.php
+++ b/includes/admin/core/class-admin-settings.php
@@ -1403,7 +1403,7 @@ if ( ! class_exists( 'um\admin\core\Admin_Settings' ) ) {
 
 			if ( isset( $_POST['um-settings-action'] ) && 'save' == $_POST['um-settings-action'] && ! empty( $_POST['um_options'] ) ) {
 
-				$nonce = $_POST['__umnonce'];
+				$nonce = ! empty( $_POST['__umnonce'] ) ? $_POST['__umnonce'] : '';
 
 				if ( ( ! wp_verify_nonce( $nonce, 'um-settings-nonce' ) || empty( $nonce ) ) || ! current_user_can('manage_options') ) {
 					// This nonce is not valid.
diff --git a/includes/core/um-filters-navmenu.php b/includes/core/um-filters-navmenu.php
index 2a470764..7eb5912b 100644
--- a/includes/core/um-filters-navmenu.php
+++ b/includes/core/um-filters-navmenu.php
@@ -127,6 +127,7 @@ if ( ! is_admin() ) {
 	}
 	add_filter( 'wp_nav_menu_objects', 'um_conditional_nav_menu', 9999, 2 );
 
+
 	/**
 	 * Conditional menu items
 	 *
@@ -136,7 +137,7 @@ if ( ! is_admin() ) {
 	 *
 	 * @return mixed
 	 */
-	function um_get_nav_menu_items($items, $menu, $args) {
+	function um_get_nav_menu_items( $items, $menu, $args ) {
 		return um_conditional_nav_menu( $items, $args );
 	}
 	add_filter( 'wp_get_nav_menu_items', 'um_get_nav_menu_items', 9999, 3 );
diff --git a/includes/um-short-functions.php b/includes/um-short-functions.php
index 95809e32..b70e18c8 100644
--- a/includes/um-short-functions.php
+++ b/includes/um-short-functions.php
@@ -1244,7 +1244,11 @@ function um_can_view_field( $data ) {
 		}
 
 		if ( is_user_logged_in() ) {
+			$previous_user = um_user( 'ID' );
+			um_fetch_user( get_current_user_id() );
+
 			$current_user_roles = um_user( 'roles' );
+			um_fetch_user( $previous_user );
 
 			if ( $data['public'] == '-3' && ! um_is_user_himself() && ( empty( $current_user_roles ) || count( array_intersect( $current_user_roles, $data['roles'] ) ) <= 0 ) )
 				return false;