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

Version 1.0.19

Browse Source
This commit is contained in:
ultimatemember
2015-01-23 19:03:29 +02:00
parent e9be3908fd
commit 63820a8ad8
16 changed files with 143 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/um-fields.php
+10 -2
View File
@@ -78,7 +78,13 @@ class UM_Fields {
if ( $args['type'] == 'row' ) {
if ( isset( $fields[$id] ) ){
$args = array_merge( $fields[$id], $args );
$old_args = $fields[$id];
foreach( $old_args as $k => $v ) {
if (!in_array($k, array('sub_rows','cols')) ) {
unset($old_args[$k]);
}
}
$args = array_merge( $old_args, $args );
}
}
@@ -517,7 +523,7 @@ class UM_Fields {
if (!isset($array['validate'])) $array['validate'] = null;
if (!isset($array['default'])) $array['default'] = null;
if ( isset( $array['conditions'] ) && is_array( $array['conditions'] ) ) {
if ( isset( $array['conditions'] ) && is_array( $array['conditions'] ) && !$this->viewing ) {
$array['conditional'] = '';
foreach( $array['conditions'] as $key => $cond ) {
$array['conditional'] .= ' data-cond-'.$key.'-action="'. $cond[0] . '" data-cond-'.$key.'-field="'. $cond[1] . '" data-cond-'.$key.'-operator="'. $cond[2] . '" data-cond-'.$key.'-value="'. $cond[3] . '"';
@@ -1799,6 +1805,8 @@ class UM_Fields {
if ( !um_can_view_field( $data ) ) return;
if ( !um_field_conditions_are_met( $data ) ) return;
switch( $type ) {
/* Default */