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

Fix PHP 7.1+ compatibility issues

Browse Source
This commit is contained in:
Champ Camba
2017-03-17 22:50:58 +08:00
parent 52ef1cee0b
commit e0d2073f55
2 changed files with 23 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin/core/um-admin-builder.php
+11 -2
View File
@@ -50,6 +50,11 @@ class UM_Admin_Builder {
*** @get fields in row
***/
function get_fields_by_row( $row_id ) {
if( empty( $this->global_fields) || ! is_array( $this->global_fields ) ){
$this->global_fields = array();
}
foreach( $this->global_fields as $key => $array ) {
if ( !isset( $array['in_row'] ) || ( isset( $array['in_row'] ) && $array['in_row'] == $row_id ) ) {
$results[$key] = $array;
@@ -127,8 +132,12 @@ class UM_Admin_Builder {
} else {
$this->global_fields = $fields;
if( empty( $fields) || ! is_array( $fields ) ){
$this->global_fields = array();
}else{
$this->global_fields = $fields;
}
foreach( $this->global_fields as $key => $array ) {
if ( $array['type'] == 'row' ) {
$rows[$key] = $array;
core/um-fields.php
+12 -12
View File
@@ -183,19 +183,19 @@ class UM_Fields {
global $ultimatemember;
$fields = $ultimatemember->query->get_attr( 'custom_fields', $form_id );
$field_scope = $ultimatemember->builtin->saved_fields;
if ( !isset( $fields[$global_id] ) ) {
$global_id = intval( $global_id );
if ( !isset( $fields[ $global_id ] ) ) {
$count = 1;
if ( isset( $fields ) && !empty( $fields) ) $count = count($fields)+1;
if ( isset( $fields ) && !empty( $fields ) ) $count = count( $fields ) + 1;
$fields[$global_id] = $field_scope[$global_id];
$fields[$global_id]['position'] = $count;
$fields[ $global_id ] = $field_scope[ $global_id ];
$fields[ $global_id ]['position'] = $count;
// set position
if ( $position ) {
foreach( $position as $key => $val ) {
$fields[$global_id][$key] = $val;
$fields[ $global_id ][ $key ] = $val;
}
}
@@ -216,19 +216,19 @@ class UM_Fields {
$fields = $ultimatemember->query->get_attr( 'custom_fields', $form_id );
$field_scope = $ultimatemember->builtin->predefined_fields;
if ( !isset( $fields[$global_id] ) ) {
$global_id = intval( $global_id );
if ( !isset( $fields[ $global_id ] ) ) {
$count = 1;
if ( isset( $fields ) && !empty( $fields) ) $count = count($fields)+1;
if ( isset( $fields ) && !empty( $fields) ) $count = count( $fields ) + 1;
$fields[$global_id] = $field_scope[$global_id];
$fields[$global_id]['position'] = $count;
$fields[ $global_id ] = $field_scope[ $global_id ];
$fields[ $global_id ]['position'] = $count;
// set position
if ( $position ) {
foreach( $position as $key => $val ) {
$fields[$global_id][$key] = $val;
$fields[ $global_id ][ $key ] = $val;
}
}