Merge branch 'allow_roles_edit_and_delete_members' of https://github.com/ultimatemember/ultimatemember into release/2.0.18

This commit is contained in:
nikitozzzzzzz
2018-06-03 17:46:40 +03:00
6 changed files with 187 additions and 159 deletions
+3 -2
View File
@@ -705,10 +705,11 @@ function um_filtered_value( $key, $data = false ) {
* @return bool|int|null
*/
function um_profile_id() {
$requested_user = um_get_requested_user();
if ( um_get_requested_user() ) {
if ( $requested_user ) {
return um_get_requested_user();
} else if (is_user_logged_in() && get_current_user_id()) {
} elseif ( is_user_logged_in() && get_current_user_id() ) {
return get_current_user_id();
}