- fixed member directory edit profile button;

- small fixes for password reset;

includes/core/class-password.php

@@ -277,8 +277,11 @@ if ( ! class_exists( 'um\core\Password' ) ) {
 			}
 
 			if ( um_is_core_page( 'password-reset' ) && isset( $_REQUEST['act'] ) && $_REQUEST['act'] == 'reset_password' ) {
+				wp_fix_server_vars();
+
 				list( $rp_path ) = explode( '?', wp_unslash( $_SERVER['REQUEST_URI'] ) );
 				$rp_cookie = 'wp-resetpass-' . COOKIEHASH;
+
 				if ( isset( $_GET['hash'] ) ) {
 					$userdata = get_userdata( wp_unslash( $_GET['user_id'] ) );
 					if ( ! $userdata || is_wp_error( $userdata ) ) {

includes/core/class-roles-capabilities.php

@@ -592,7 +592,7 @@ if ( ! class_exists( 'um\core\Roles_Capabilities' ) ) {
 
 			um_fetch_user( get_current_user_id() );
 
-			$current_user_roles = UM()->roles()->get_all_user_roles( $user_id );
+			$current_user_roles = $this->get_all_user_roles( $user_id );
 
 			switch( $cap ) {
 				case 'edit':

includes/um-short-functions.php

@@ -2131,7 +2131,7 @@ function um_get_default_cover_uri() {
  * @param $data
  * @param null $attrs
  *
- * @return string
+ * @return string|array
  */
 function um_user( $data, $attrs = null ) {