- fixed member directory edit profile button;

- small fixes for password reset;
This commit is contained in:
nikitasinelnikov
2019-03-22 14:12:44 +02:00
parent a36f8b49f8
commit 127086942a
4 changed files with 9 additions and 4 deletions
+3
View File
@@ -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 ) ) {
+1 -1
View File
@@ -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':
+1 -1
View File
@@ -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 ) {
+4 -2
View File
@@ -60,9 +60,11 @@
*/
do_action( 'um_members_just_after_name', um_user('ID'), $args ); ?>
<?php if ( UM()->roles()->um_current_user_can( 'edit', um_user('ID') ) || UM()->roles()->um_user_can( 'can_edit_everyone' ) ) { ?>
<?php if ( UM()->roles()->um_current_user_can( 'edit', um_user('ID') ) ) { ?>
<div class="um-members-edit-btn">
<a href="<?php echo um_edit_profile_url() ?>" class="um-edit-profile-btn um-button um-alt"><?php _e( 'Edit profile','ultimate-member' ) ?></a>
<a href="<?php echo um_edit_profile_url() ?>" class="um-edit-profile-btn um-button um-alt">
<?php _e( 'Edit profile','ultimate-member' ) ?>
</a>
</div>
<?php }