From 70e11a6a18a3c848f40a95fcc36a666be1be4cb4 Mon Sep 17 00:00:00 2001
From: nikitasinelnikov <nsinelnikov.work@gmail.com>
Date: Mon, 22 Jul 2019 12:44:58 +0300
Subject: [PATCH] - small fixes;

---
 includes/um-short-functions.php       | 6 +++++-
 templates/members-grid.php            | 4 ++--
 templates/profile/comments-single.php | 2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/includes/um-short-functions.php b/includes/um-short-functions.php
index 8779538d..d42ed97e 100644
--- a/includes/um-short-functions.php
+++ b/includes/um-short-functions.php
@@ -1284,7 +1284,11 @@ function um_get_display_name( $user_id ) {
  * @return mixed
  */
 function um_members( $argument ) {
-	return UM()->members()->results[ $argument ];
+	$result = null;
+	if ( isset( UM()->members()->results[ $argument ] ) ) {
+		$result = UM()->members()->results[ $argument ];
+	}
+	return $result;
 }
 
 
diff --git a/templates/members-grid.php b/templates/members-grid.php
index 9a19e420..279eb927 100644
--- a/templates/members-grid.php
+++ b/templates/members-grid.php
@@ -11,7 +11,7 @@
 
 		<div class="um-member um-role-<?php echo esc_attr( um_user( 'role' ) ) . ' ' . esc_attr( um_user('account_status') ); ?> <?php if ( $cover_photos ) { echo 'with-cover'; } ?>">
 
-			<span class="um-member-status <?php echo esc_attr( um_user('account_status') ); ?>"><?php echo esc_html( um_user('account_status_name') ); ?></span>
+			<span class="um-member-status <?php echo esc_attr( um_user('account_status') ); ?>"><?php echo esc_html( um_user( 'account_status_name' ) ); ?></span>
 
 			<?php if ( $cover_photos ) {
 				$sizes = UM()->options()->get( 'cover_thumb_sizes' );
@@ -144,7 +144,7 @@
 										} ?>
 
 										<div class="um-member-metaline um-member-metaline-<?php echo esc_attr( $key ); ?>">
-											<span><strong><?php echo esc_html( UM()->fields()->get_label( $key ) ); ?>:</strong> <?php _e( $value, 'ultimate-member' ); ?></span>
+											<span><strong><?php echo UM()->fields()->get_label( $key ); ?>:</strong> <?php _e( $value, 'ultimate-member' ); ?></span>
 										</div>
 
 									<?php }
diff --git a/templates/profile/comments-single.php b/templates/profile/comments-single.php
index 4110dd35..fca59a8a 100644
--- a/templates/profile/comments-single.php
+++ b/templates/profile/comments-single.php
@@ -17,7 +17,7 @@ foreach ( UM()->shortcodes()->loop as $comment ) {
 		<div class="um-item-link">
 			<i class="um-icon-chatboxes"></i>
 			<a href="<?php echo esc_url( get_comment_link( $comment->comment_ID ) ); ?>">
-				<?php echo esc_html( get_comment_excerpt( $comment->comment_ID ) ); ?>
+				<?php echo get_comment_excerpt( $comment->comment_ID ); ?>
 			</a>
 		</div>
 		<div class="um-item-meta">