From 03c47ebc4531de870ba097cf9f501b7c8a8cbc16 Mon Sep 17 00:00:00 2001
From: nikitozzzzzzz <nsinelnikov.work@gmail.com>
Date: Thu, 3 May 2018 16:20:46 +0300
Subject: [PATCH] - fixed checkboxes with "'" symbols in label; - fixed User
 page restriction options;

---
 includes/core/class-access.php       | 2 +-
 includes/core/class-fields.php       | 7 ++++++-
 includes/core/um-actions-profile.php | 3 +++
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/includes/core/class-access.php b/includes/core/class-access.php
index c0d601ac..7f1c1fc5 100644
--- a/includes/core/class-access.php
+++ b/includes/core/class-access.php
@@ -532,7 +532,7 @@ if ( ! class_exists( 'um\core\Access' ) ) {
 			if ( ! empty( $post->post_type ) && $post->post_type == 'page' ) {
 				if ( um_is_core_post( $post, 'login' ) || um_is_core_post( $post, 'register' ) ||
 				     um_is_core_post( $post, 'account' ) || um_is_core_post( $post, 'logout' ) ||
-				     um_is_core_post( $post, 'password-reset' ) )
+				     um_is_core_post( $post, 'password-reset' ) || um_is_core_post( $post, 'user' ) )
 					return false;
 			}
 
diff --git a/includes/core/class-fields.php b/includes/core/class-fields.php
index 9cab1a87..2dc39756 100644
--- a/includes/core/class-fields.php
+++ b/includes/core/class-fields.php
@@ -798,6 +798,11 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 					return true;
 				}
 
+				$stripslashed = array_map( 'stripslashes', UM()->form()->post_form[ $key ] );
+				if ( in_array( $value, $stripslashed ) ) {
+					return true;
+				}
+
 				if ( in_array( html_entity_decode( $value ), UM()->form()->post_form[ $key ] ) ) {
 					return true;
 				}
@@ -1578,7 +1583,7 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 
 			if ($visibility == 'view' && $this->set_mode != 'register') return;
 
-			if (( $visibility == 'view' && $this->set_mode == 'register' ) ||
+			if ( ( $visibility == 'view' && $this->set_mode == 'register' ) ||
 				( isset( $data['editable'] ) && $data['editable'] == 0 && $this->set_mode == 'profile' )
 			) {
 
diff --git a/includes/core/um-actions-profile.php b/includes/core/um-actions-profile.php
index 803a3e88..912be967 100644
--- a/includes/core/um-actions-profile.php
+++ b/includes/core/um-actions-profile.php
@@ -220,6 +220,9 @@ function um_user_edit_profile( $args ) {
 	if ( ! empty( $fields ) ) {
 		foreach ( $fields as $key => $array ) {
 
+			/*if ( ! um_can_edit_field( $fields[ $key ] ) )
+				continue;*/
+
 			if ( ! um_can_edit_field( $fields[ $key ] ) && isset( $fields[ $key ]['editable'] ) && ! $fields[ $key ]['editable'] )
 				continue;