[FIX] Fix Saving New Settings

papayaCMS · Oct 21, 2020 · 82f3aeb · 82f3aeb
1 parent abbc707
commit 82f3aeb
Showing 1 changed file with 12 additions and 2 deletions.
diff --git a/src/system/Papaya/Administration/Settings/Commands/EditSetting.php b/src/system/Papaya/Administration/Settings/Commands/EditSetting.php
@@ -54,8 +54,18 @@ public function createDialog() {
         ]
       );
       $dialog->caption = new TranslatedText('Edit Setting');
-      $dialog->data()->merge($this->record());
-      $currentValue = $this->record()->value;
+      if ($this->record()->isLoaded()) {
+        $dialog->data()->merge($this->record());
+        $currentValue = $this->record()->value;
+      } else {
+        $currentValue = $this->papaya()->options->get($settingName);
+        $dialog->data()->merge(
+          [
+            'name' => $settingName,
+            'value' => $currentValue
+          ]
+        );
+      }
       if ($profile = $this->groups()->getProfile($settingName)) {
         $dialog->fields[] = $field = new Dialog\Field\Sheet();
         $sheet = $field->sheet();