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

- fixed builder issues;

Browse Source
This commit is contained in:
Mykyta Synelnikov
2023-12-06 17:55:20 +02:00
parent 4eb3ff2093
commit 7778186f83
3 changed files with 28 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
includes/admin/core/class-admin-builder.php
+4 -4
View File
@@ -1014,7 +1014,7 @@ if ( ! class_exists( 'um\admin\core\Admin_Builder' ) ) {
<?php
if ( is_array( $field_type_data['col1'] ) ) {
foreach ( $field_type_data['col1'] as $opt ) {
$metabox->field_input( $opt );
$metabox->field_input( $opt, $arg2 );
}
}
?>
@@ -1023,7 +1023,7 @@ if ( ! class_exists( 'um\admin\core\Admin_Builder' ) ) {
<?php
if ( array_key_exists( 'col2', $field_type_data ) && is_array( $field_type_data['col2'] ) ) {
foreach ( $field_type_data['col2'] as $opt ) {
$metabox->field_input( $opt );
$metabox->field_input( $opt, $arg2 );
}
}
?>
@@ -1032,7 +1032,7 @@ if ( ! class_exists( 'um\admin\core\Admin_Builder' ) ) {
<?php
if ( array_key_exists( 'col3', $field_type_data ) && is_array( $field_type_data['col3'] ) ) {
foreach ( $field_type_data['col3'] as $opt ) {
$metabox->field_input( $opt );
$metabox->field_input( $opt, $arg2 );
}
}
?>
@@ -1040,7 +1040,7 @@ if ( ! class_exists( 'um\admin\core\Admin_Builder' ) ) {
<?php
if ( array_key_exists( 'col_full', $field_type_data ) && is_array( $field_type_data['col_full'] ) ) {
foreach ( $field_type_data['col_full'] as $opt ) {
$metabox->field_input( $opt );
$metabox->field_input( $opt, $arg2 );
}
}
includes/admin/core/class-admin-metabox.php
+5 -1
View File
@@ -1357,6 +1357,10 @@ if ( ! class_exists( 'um\admin\core\Admin_Metabox' ) ) {
$this->edit_mode_value = isset( $this->edit_array[ $real_attr ] ) ? $this->edit_array[ $real_attr ] : null;
}
$form_data = UM()->query()->post_data( $form_id );
if ( empty( $form_data['mode'] ) && ! empty( $_POST['form_mode'] ) ) {
// Case when we add new form with no form mode in postmeta. Then get form mode from AJAX request.
$form_data['mode'] = sanitize_key( $_POST['form_mode'] );
}
switch ( $attribute ) {
default:
@@ -1490,7 +1494,7 @@ if ( ! class_exists( 'um\admin\core\Admin_Metabox' ) ) {
break;
case '_validate':
if ( 'login' === $form_data['mode'] && in_array( $field_args['metakey'], array( 'username', 'user_login', 'user_email' ) ) ) {
if ( array_key_exists( 'mode', $form_data ) && 'login' === $form_data['mode'] && in_array( $field_args['metakey'], array( 'username', 'user_login', 'user_email' ), true ) ) {
return;
}
?>
includes/core/class-query.php
+19 -22
View File
@@ -412,43 +412,40 @@ if ( ! class_exists( 'um\core\Query' ) ) {
return false;
}
/**
* Get post data
*
* @param $post_id
* @param int $post_id
*
* @return mixed
* @return array
*/
function post_data( $post_id ) {
public function post_data( $post_id ) {
$array['form_id'] = $post_id;
$mode = $this->get_attr('mode', $post_id);
$meta = get_post_custom( $post_id );
foreach ($meta as $k => $v){
if ( strstr($k, '_um_'.$mode.'_' ) ) {
$k = str_replace('_um_'.$mode.'_', '', $k);
$array[$k] = $v[0];
} elseif ($k == '_um_mode'){
$k = str_replace('_um_', '', $k);
$array[$k] = $v[0];
} elseif ( strstr($k, '_um_') ) {
$k = str_replace('_um_', '', $k);
$array[$k] = $v[0];
$mode = $this->get_attr( 'mode', $post_id );
$meta = get_post_custom( $post_id );
foreach ( $meta as $k => $v ) {
if ( strstr( $k, '_um_' . $mode . '_' ) ) {
$k = str_replace( '_um_' . $mode . '_', '', $k );
$array[ $k ] = $v[0];
} elseif ( '_um_mode' === $k ) {
$k = str_replace( '_um_', '', $k );
$array[ $k ] = $v[0];
} elseif ( strstr( $k, '_um_' ) ) {
$k = str_replace( '_um_', '', $k );
$array[ $k ] = $v[0];
}
}
foreach( $array as $k => $v ) {
if ( strstr( $k, 'login_') || strstr( $k, 'register_' ) || strstr( $k, 'profile_' ) ){
if ( $mode != 'directory' ) {
unset($array[$k]);
foreach ( $array as $k => $v ) {
if ( strstr( $k, 'login_' ) || strstr( $k, 'register_' ) || strstr( $k, 'profile_' ) ) {
if ( 'directory' !== $mode ) {
unset( $array[ $k ] );
}
}
}
return $array;
}
/**
* Capture selected value
*