10h30/ultimatemember
1
0
Fork 0
mirror of https://github.com/10h30/ultimatemember.git synced 2026-06-05 15:09:37 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/ultimatemember/ultimatemember

Browse Source
This commit is contained in:
nikitasinelnikov
2019-11-28 12:51:58 +02:00
parent 8fe4ece67a e9ef108e42
commit a3a6b7630f
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
includes/core/class-fields.php
+4 -1
View File
@@ -591,6 +591,9 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
* @return mixed
*/
function field_value( $key, $default = false, $data = null ) {
if( defined('DOING_AJAX') && DOING_AJAX ) return '';
if ( isset( $_SESSION ) && isset( $_SESSION['um_social_profile'][ $key ] ) && isset( $this->set_mode ) && $this->set_mode == 'register' ) {
return $_SESSION['um_social_profile'][ $key ];
}
@@ -1925,7 +1928,7 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
um_fetch_user( $_um_profile_id );
// do not show passwords
if ( isset( UM()->user()->preview ) && UM()->user()->preview ) {
if ( isset( UM()->user()->preview ) && UM()->user()->preview && ! is_admin() ) {
if ( $data['type'] == 'password' ) {
return '';
}
includes/core/class-shortcodes.php
+1 -1
View File
@@ -134,7 +134,7 @@ if ( ! class_exists( 'um\core\Shortcodes' ) ) {
* @return array
*/
function display_logout_form( $args ) {
if ( is_user_logged_in() && isset( $args['mode'] ) && $args['mode'] == 'login' ) {
if ( is_user_logged_in() && isset( $args['mode'] ) && $args['mode'] == 'login' && ! is_admin() ) {
if ( get_current_user_id() != um_user( 'ID' ) ) {
um_fetch_user( get_current_user_id() );
includes/core/um-actions-login.php
+1 -1
View File
@@ -325,7 +325,7 @@ add_action( 'um_submit_form_login', 'um_submit_form_login', 10 );
*/
function um_add_submit_button_to_login( $args ) {
// DO NOT add when reviewing user's details
if ( UM()->user()->preview == true && is_admin() ) {
if ( UM()->user()->preview == true && ! is_admin() ) {
return;
}