Fix validation on drafts (#22)

marcbelletre · Nov 2, 2023 · 884047e · 884047e
1 parent 17d6388
commit 884047e
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 3 deletions.
diff --git a/acf-rrule.php b/acf-rrule.php
@@ -4,7 +4,7 @@
 Plugin Name: ACF RRule Field
 Plugin URI: https://github.com/marcbelletre/acf-rrule
 Description: Create recurring rules with a single ACF field
-Version: 1.3.1.1
+Version: 1.3.2
 Author: Marc Bellêtre
 Author URI: https://pixelparfait.fr
 License: MIT
@@ -44,7 +44,7 @@ public function __construct()
             // Settings
             // - these will be passed into the field class.
             $this->settings = [
-                'version'	=> '1.3.1.1',
+                'version'	=> '1.3.2',
                 'url'		=> plugin_dir_url(__FILE__),
                 'path'		=> plugin_dir_path(__FILE__),
             ];

diff --git a/fields/class-acf-field-rrule.php b/fields/class-acf-field-rrule.php
@@ -810,21 +810,46 @@ public function update_value($value, $post_id, $field)
 
                 switch ($value['frequency']) {
                     case 'WEEKLY':
+                        // Bail early if weekdays are not set
+                        if (!isset($value['weekdays'])) {
+                            return $value;
+                        }
+
                         $rule->setByDay($value['weekdays']);
 
                         break;
 
                     case 'MONTHLY':
+                        // Bail early if monthly_by is not set
+                        if (!isset($value['monthly_by'])) {
+                            return $value;
+                        }
+
                         if ($value['monthly_by'] == 'monthdays') {
+                            // Bail early if monthdays are not set
+                            if (!isset($value['monthdays'])) {
+                                return $value;
+                            }
+
                             $rule->setByMonthDay($value['monthdays']);
                         } else {
+                            // Bail early if bysetpost & byweekday are not set
+                            if (!(isset($value['bysetpos']) && isset($value['byweekday']))) {
+                                return $value;
+                            }
+
                             $rule->setBySetPosition($value['bysetpos']);
                             $rule->setByDay($value['byweekday']);
                         }
 
                         break;
 
                     case 'YEARLY':
+                        // Bail early if months are not set
+                        if (!isset($value['months'])) {
+                            return $value;
+                        }
+
                         $rule->setByMonth($value['months']);
 
                         break;

diff --git a/readme.txt b/readme.txt
@@ -4,7 +4,7 @@ Tags: acf, rrule, recurrence, date, calendar
 Requires at least: 4.7
 Tested up to: 6.3
 Requires PHP: 7.2
-Stable tag: 1.3.1.1
+Stable tag: 1.3.2
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 
@@ -31,6 +31,9 @@ This plugin requires ACF or ACF Pro to work.
 
 == Changelog ==
 
+= 1.3.2 =
+* Fix validation on drafts
+
 = 1.3.1.1 =
 * Upload new tag for wpackagist