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

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

Browse Source
This commit is contained in:
nikitozzzzzzz
2018-10-01 15:44:03 +03:00
parent c177a7f870 8646e061af
commit 552accbcc9
2 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
includes/core/um-actions-form.php
+8 -2
View File
@@ -346,7 +346,10 @@ function um_submit_form_errors_hook_( $args ) {
continue 2;
}
} elseif ( $op == 'contains' ) {
if ( strstr( $cond_value, $parent_value ) ) {
if ( is_string( $cond_value ) && strstr( $cond_value, $parent_value ) ) {
continue 2;
}
if( is_array( $cond_value ) && in_array( $parent_value, $cond_value ) ) {
continue 2;
}
}
@@ -376,7 +379,10 @@ function um_submit_form_errors_hook_( $args ) {
continue 2;
}
} elseif ( $op == 'contains' ) {
if ( ! strstr( $cond_value, $parent_value ) ) {
if ( is_string( $cond_value ) && ! strstr( $cond_value, $parent_value ) ) {
continue 2;
}
if( is_array( $cond_value ) && !in_array( $parent_value, $cond_value ) ) {
continue 2;
}
}
includes/core/um-filters-fields.php
+8 -2
View File
@@ -405,7 +405,10 @@ function um_get_custom_field_array( $array, $fields ) {
$array['required'] = 0;
}
} elseif ( $op == 'contains' ) {
if ( strstr( $cond_value, $parent_value ) ) {
if ( is_string( $cond_value ) && strstr( $cond_value, $parent_value ) ) {
$array['required'] = 0;
}
if( is_array( $cond_value ) && in_array( $parent_value, $cond_value ) ) {
$array['required'] = 0;
}
}
@@ -435,7 +438,10 @@ function um_get_custom_field_array( $array, $fields ) {
$array['required'] = 0;
}
} elseif ( $op == 'contains' ) {
if ( ! strstr( $cond_value, $parent_value ) ) {
if( is_string( $cond_value ) && !strstr( $cond_value, $parent_value ) ) {
$array['required'] = 0;
}
if( is_array( $cond_value ) && !in_array( $parent_value, $cond_value ) ) {
$array['required'] = 0;
}
}