Pilopress 0.5.0

includes/classes/core/class-upgrades.php

@@ -141,7 +141,17 @@ public function upgrade_0_4_0() {
             $buttons = get_field( 'pip_button', 'pip_styles_tinymce' );
             if ( is_array( $buttons ) ) {
                 foreach ( $buttons as $key => $item ) {
-                    $old_classes = $item['classes_to_apply'];
+
+                    // Skip if no content
+                    if ( !$item ) {
+                        continue;
+                    }
+
+                    // Skip if no classes
+                    $old_classes = acf_maybe_get( $item, 'classes_to_apply' );
+                    if ( !$old_classes ) {
+                        continue;
+                    }
 
                     if ( strstr( $old_classes, ' ' ) ) {
                         $old_classes = explode( ' ', $old_classes );
@@ -182,7 +192,7 @@ public function upgrade_0_4_0() {
                         $item['classes_to_apply'] = implode( ' ', $old_classes );
                         $item['states']           = $states;
                     } else {
-                        $item['class_name']       = $item['classes_to_apply'];
+                        $item['class_name']       = acf_maybe_get( $item, 'classes_to_apply' );
                         $item['classes_to_apply'] = '';
                     }
 

includes/classes/main/class-flexible.php

@@ -253,14 +253,14 @@ public function get_layouts_and_group_keys() {
                 // Store layout
                 $layouts[ $layout_uniq_id ] = array(
                     'key'                           => $layout_uniq_id,
-                    'name'                          => $name,
+                    'name'                          => $layout_slug,
                     'label'                         => $title,
                     'display'                       => $display,
                     'sub_fields'                    => array(
                         array(
                             'key'               => 'field_clone_' . $layout_slug,
                             'label'             => $title,
-                            'name'              => $name,
+                            'name'              => $layout_slug,
                             'type'              => 'clone',
                             'instructions'      => '',
                             'required'          => 0,

includes/classes/pattern/class-flexible-footer.php

@@ -196,12 +196,13 @@ public function prepare_flexible_field( $field ) {
 
                 // Sanitize name
                 $field_group_name = sanitize_title( $field_group['title'] );
+                $field_group_slug = sanitize_title( $field_group['_pip_layout_slug'] );
 
                 // Browse all layouts
                 foreach ( $layouts as $key => $layout ) {
 
                     // If field group not in layouts, skip
-                    if ( $layout['name'] !== $field_group_name ) {
+                    if ( $layout['name'] !== $field_group_name && $layout['name'] !== $field_group_slug ) {
                         continue;
                     }
 

includes/classes/pattern/class-flexible-header.php

@@ -201,12 +201,13 @@ public function prepare_flexible_field( $field ) {
 
                 // Sanitize name
                 $field_group_name = sanitize_title( $field_group['title'] );
+                $field_group_slug = sanitize_title( $field_group['_pip_layout_slug'] );
 
                 // Browse all layouts
                 foreach ( $layouts as $key => $layout ) {
 
                     // If field group not in layouts, skip
-                    if ( $layout['name'] !== $field_group_name ) {
+                    if ( $layout['name'] !== $field_group_name && $layout['name'] !== $field_group_slug ) {
                         continue;
                     }
 

pilopress.php

@@ -3,7 +3,7 @@
  * Plugin Name:         Pilo'Press
  * Plugin URI:          https://www.pilot-in.com
  * Description:         The most advanced WordPress Page Builder using Advanced Custom Field & TailwindCSS
- * Version:             0.4.0
+ * Version:             0.5.0
  * Author:              Pilot'in
  * Author URI:          https://www.pilot-in.com
  * License:             GPLv2 or later
@@ -28,7 +28,7 @@ class PiloPress {
          *
          * @var string
          */
-        public $version = '0.4.0';
+        public $version = '0.5.0';
 
         /**
          * ACF

readme.txt

@@ -5,7 +5,7 @@ Tags: acf, page builder, tailwindcss
 Requires at least: 4.9
 Tested up to: 5.5.1
 Requires PHP: 5.6
-Stable tag: 0.4.0
+Stable tag: 0.5.0
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html