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 remote-tracking branch 'remotes/origin/fix/custom_callback_function_for_multi-select_select_type_field'

Browse Source
This commit is contained in:
nikitasinelnikov
2019-07-16 14:26:34 +03:00
parent dea3112dde a11fd188fa
commit 77a98acc2f
3 changed files with 67 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
includes/core/um-actions-profile.php
+25 -3
View File
@@ -215,8 +215,8 @@ function um_user_edit_profile( $args ) {
*/
do_action( 'um_user_before_updating_profile', $userinfo );
if ( ! empty( $args['custom_fields'] ) ) {
$fields = unserialize( $args['custom_fields'] );
if ( !empty( $args[ 'custom_fields' ] ) ) {
$fields = apply_filters( 'um_user_edit_profile_fields', unserialize( $args[ 'custom_fields' ] ), $args );
}
// loop through fields
@@ -246,6 +246,27 @@ function um_user_edit_profile( $args ) {
}
}
/**
* Returns dropdown/multi-select options keys from a callback function
* @since 2019-05-30
*/
$has_custom_source = apply_filters("um_has_dropdown_options_source__{$key}", false );
if ( isset( $array[ 'options' ] ) && in_array( $array[ 'type' ], array( 'select', 'multiselect' ) ) ) {
if ( !empty( $array[ 'custom_dropdown_options_source' ] ) && function_exists( $array[ 'custom_dropdown_options_source' ] ) && ! $has_custom_source ) {
$options = call_user_func( $array[ 'custom_dropdown_options_source' ], $array[ 'options' ] );
if( is_array( $options ) ){
$array[ 'options' ] = apply_filters("um_custom_dropdown_options__{$key}", array_keys( $options ) );
}
}else{
$array[ 'options' ] = apply_filters("um_custom_dropdown_options__{$key}", array() );
}
}
//validation of correct values from options in wp-admin
$stripslashes = $args['submitted'][ $key ];
if ( is_string( $stripslashes ) ) {
@@ -253,7 +274,7 @@ function um_user_edit_profile( $args ) {
}
if ( in_array( $array['type'], array( 'select' ) ) &&
! empty( $array['options'] ) && ! empty( $stripslashes ) &&
! in_array( $stripslashes, array_map( 'trim', $array['options'] ) ) ) {
! in_array( $stripslashes, array_map( 'trim', $array['options'] ) ) && ! $has_custom_source ) {
continue;
}
@@ -299,6 +320,7 @@ function um_user_edit_profile( $args ) {
}
}
if ( isset( $args['submitted']['description'] ) ) {
$to_update['description'] = $args['submitted']['description'];
}