Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Pilopress 0.5.0 #184

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Pilopress 0.5.0 #184

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
0c8a995
use layout slug instead of layout title
maelys-pilotin Feb 1, 2021
3925294
Merge branch 'master' into pilopress-0-5-0
maelys-pilotin Feb 5, 2021
d3698b3
fix layout slug test for header and footer flexible
maelys-pilotin Feb 11, 2021
3a32d78
#139 - Try fix error on install + update version
maelys-pilotin Jun 8, 2021
5f1fbb7
#139 - Add debug log
maelys-pilotin Jun 8, 2021
c6a8340
Try fix Pilo'Press #139
maelys-pilotin Jun 8, 2021
6d93c1b
Merge branch 'master' into pilopress-0-5-0
maelys-pilotin Jun 8, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions includes/classes/core/class-upgrades.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 );
Expand Down Expand Up @@ -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'] = '';
}

Expand Down
4 changes: 2 additions & 2 deletions includes/classes/main/class-flexible.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
3 changes: 2 additions & 1 deletion includes/classes/pattern/class-flexible-footer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
3 changes: 2 additions & 1 deletion includes/classes/pattern/class-flexible-header.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
4 changes: 2 additions & 2 deletions pilopress.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -28,7 +28,7 @@ class PiloPress {
*
* @var string
*/
public $version = '0.4.0';
public $version = '0.5.0';

/**
* ACF
Expand Down
2 changes: 1 addition & 1 deletion readme.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down