From 162c71478e75454cd00ab5a559b805a4686ba0d1 Mon Sep 17 00:00:00 2001 From: ultimatemember Date: Mon, 22 Dec 2014 13:03:23 +0200 Subject: [PATCH] Fixed bug with password reset form when not logged in --- core/um-short-functions.php | 20 ++++++++++++-------- um-config.php | 2 +- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/core/um-short-functions.php b/core/um-short-functions.php index d2e57c9d..30479999 100644 --- a/core/um-short-functions.php +++ b/core/um-short-functions.php @@ -206,16 +206,20 @@ function um_can_view_field( $data ) { global $ultimatemember; - if ( !is_user_logged_in() && $data['public'] != '1' ) return false; + if ( isset( $data['public'] ) ) { - if ( is_user_logged_in() && isset( $data['public'] ) ) { - - if ( !um_is_user_himself() && $data['public'] == '-1' && !um_user_can('can_edit_everyone') ) - return false; - - if ( $data['public'] == '-2' && $data['roles'] ) - if ( !in_array( $ultimatemember->query->get_role_by_userid( get_current_user_id() ), $data['roles'] ) ) + if ( !is_user_logged_in() && $data['public'] != '1' ) return false; + + if ( is_user_logged_in() ) { + + if ( !um_is_user_himself() && $data['public'] == '-1' && !um_user_can('can_edit_everyone') ) return false; + + if ( $data['public'] == '-2' && $data['roles'] ) + if ( !in_array( $ultimatemember->query->get_role_by_userid( get_current_user_id() ), $data['roles'] ) ) + return false; + } + } return true; diff --git a/um-config.php b/um-config.php index dddc11c3..865c8de9 100644 --- a/um-config.php +++ b/um-config.php @@ -378,7 +378,7 @@ $this->sections[] = array( 'id' => 'mail_from', 'type' => 'text', 'title' => __( 'Mail appears from' ), - 'desc' => __( 'e.g. Company Name' ), + 'desc' => __( 'e.g. Site Name' ), 'default' => get_bloginfo('name'), ),