From bc5aec27d363a063c8edd0db298a722e2b804a26 Mon Sep 17 00:00:00 2001
From: yuriinalivaiko <yuriinalivaiko.work@gmail.com>
Date: Mon, 2 Aug 2021 16:31:58 +0300
Subject: [PATCH] Fix columns

---
 includes/admin/core/class-admin-builder.php |  2 ++
 includes/core/class-fields.php              | 24 ++++++++++++++-------
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/includes/admin/core/class-admin-builder.php b/includes/admin/core/class-admin-builder.php
index 5b5ac7c5..6df4f32e 100644
--- a/includes/admin/core/class-admin-builder.php
+++ b/includes/admin/core/class-admin-builder.php
@@ -494,6 +494,8 @@ if ( ! class_exists( 'um\admin\core\Admin_Builder' ) ) {
 
 										if ( !isset( $array['cols'] ) ){
 											$col_num = 1;
+										} elseif ( is_numeric( $array['cols'] ) ) {
+											$col_num = (int) $array['cols'];
 										} else {
 
 											$col_split = explode(':', $array['cols'] );
diff --git a/includes/core/class-fields.php b/includes/core/class-fields.php
index acb1d50c..d1c74a04 100644
--- a/includes/core/class-fields.php
+++ b/includes/core/class-fields.php
@@ -3920,12 +3920,16 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 
 							// cols
 							$cols = ( isset( $row_array['cols'] ) ) ? $row_array['cols'] : 1;
-							if ( strstr( $cols, ':' ) ) {
-								$col_split = explode( ':', $cols );
+							if( is_numeric( $cols ) ){
+								$cols_num = (int) $cols;
 							} else {
-								$col_split = array( $cols );
+								if ( strstr( $cols, ':' ) ) {
+									$col_split = explode( ':', $cols );
+								} else {
+									$col_split = array( $cols );
+								}
+								$cols_num = $col_split[ $c ];
 							}
-							$cols_num = $col_split[ $c ];
 
 							// sub row fields
 							$subrow_fields = null;
@@ -4402,12 +4406,16 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 
 							// cols
 							$cols = ( isset( $row_array['cols'] ) ) ? $row_array['cols'] : 1;
-							if ( strstr( $cols, ':' ) ) {
-								$col_split = explode( ':', $cols );
+							if( is_numeric( $cols ) ){
+								$cols_num = (int) $cols;
 							} else {
-								$col_split = array( $cols );
+								if ( strstr( $cols, ':' ) ) {
+									$col_split = explode( ':', $cols );
+								} else {
+									$col_split = array( $cols );
+								}
+								$cols_num = $col_split[ $c ];
 							}
-							$cols_num = $col_split[ $c ];
 
 							// sub row fields
 							$subrow_fields = null;