Addressing notices thrown when creating and editing series

src/EventCreationService.php

@@ -341,11 +341,11 @@ class EventCreationService {
               }
             }
             else {
-              if ($entity_config['monthday'] !== $form_config['monthday']) {
-                $diff['monthday'] = [
+              if ($entity_config['day_of_month'] !== $form_config['day_of_month']) {
+                $diff['day_of_month'] = [
                   'label' => $this->translation->translate('Day of the Month'),
-                  'stored' => implode(',', $entity_config['monthday']),
-                  'override' => implode(',', $form_config['monthday']),
+                  'stored' => implode(',', $entity_config['day_of_month']),
+                  'override' => implode(',', $form_config['day_of_month']),
                 ];
               }
             }

src/Form/EventSeriesForm.php

@@ -98,7 +98,6 @@ class EventSeriesForm extends ContentEntityForm {
 
     /* @var $entity \Drupal\recurring_events\Entity\EventSeries */
     $entity = $this->entity;
-    $original = $this->storage->loadUnchanged($entity->id());
 
     $form['custom_date']['#states'] = [
       'visible' => [
@@ -107,6 +106,7 @@ class EventSeriesForm extends ContentEntityForm {
     ];
 
     if ($editing) {
+      $original = $this->storage->loadUnchanged($entity->id());
       if ($this->step === 1) {
         $diff_array = $this->creationService->buildDiffArray($original, $form_state);
 
@@ -194,12 +194,12 @@ class EventSeriesForm extends ContentEntityForm {
 
     /* @var $entity \Drupal\recurring_events\Entity\EventSeries */
     $entity = $this->entity;
-    $original = $this->storage->loadUnchanged($entity->id());
 
     $editing = ($form_state->getBuildInfo()['form_id'] == 'eventseries_edit_form');
     $trigger = $form_state->getTriggeringElement();
 
     if ($trigger['#id'] !== 'edit-confirm' && $editing) {
+      $original = $this->storage->loadUnchanged($entity->id());
       if ($this->creationService->checkForRecurConfigChanges($original, $form_state)) {
         $this->step = 1;
         $form_state->setRebuild(TRUE);