10h30/ultimatemember
1
0
Fork 0
mirror of https://github.com/10h30/ultimatemember.git synced 2026-07-19 22:54:03 +09:00
Code Issues Packages Projects Releases Wiki Activity

- fixed default avatar URL for sites at subfolder;

Browse Source 
- user registration optimization (removed edit profile handlers on user registration);
- fixed "can edit" checkbox at Forms add field modal window;
This commit is contained in:
nikitozzzzzzz
2017-08-31 15:05:27 +03:00
parent 1f5bf3dafc
commit 026b783a24
9 changed files with 106 additions and 205 deletions
Download Patch File Download Diff File Expand all files Collapse all files
includes/um-short-functions.php
+15 -9
View File
@@ -1360,10 +1360,13 @@
return $uri;
}
/***
*** @default avatar
***/
function um_get_default_avatar_uri( $user_id = '' ) {
/**
* Default avatar URL
*
* @return string
*/
function um_get_default_avatar_uri() {
$uri = um_get_option( 'default_avatar' );
$uri = ! empty( $uri['url'] ) ? $uri['url'] : '';
if ( ! $uri ) {
@@ -1372,15 +1375,18 @@
//http <-> https compatibility default avatar option of SSL was changed
$url_array = parse_url( $uri );
$setting_url = $url_array['scheme'] . '://' . $url_array['host'];
if ( $setting_url != site_url() )
$uri = str_replace( $setting_url, site_url(), $uri );
}
if ( is_ssl() && $url_array['scheme'] == 'http' ) {
$uri = str_replace( 'http://', 'https://', $uri );
} elseif ( ! is_ssl() && $url_array['scheme'] == 'https' ) {
$uri = str_replace( 'https://', 'http://', $uri );
}
}
return $uri;
}
/***
*** @get user avatar url
***/
@@ -1616,7 +1622,7 @@
} elseif( um_user('synced_profile_photo') ){
$avatar_uri = um_user('synced_profile_photo');
} else {
$avatar_uri = um_get_default_avatar_uri( um_user('ID') );
$avatar_uri = um_get_default_avatar_uri();
}
$avatar_uri = apply_filters('um_user_avatar_url_filter', $avatar_uri, um_user('ID') );