From e1a4e4bd6af92bd83beac360b28f916538611236 Mon Sep 17 00:00:00 2001
From: Awilum <awilum@msn.com>
Date: Mon, 18 Feb 2019 02:15:25 +0300
Subject: [PATCH] Admin Panel: Entries Manager - cleanup and refactoring.

---
 site/plugins/admin/classes/EntriesManager.php | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/site/plugins/admin/classes/EntriesManager.php b/site/plugins/admin/classes/EntriesManager.php
index a27fc6e9..92268f9e 100644
--- a/site/plugins/admin/classes/EntriesManager.php
+++ b/site/plugins/admin/classes/EntriesManager.php
@@ -551,7 +551,7 @@ class EntriesManager
                 // Set new entry name
                 $entry = $parent_entry . Text::safeString(Http::post('slug'), '-', true);
 
-                // Check if new entry directory exists
+                // Check if new entry exists
                 if (!Entries::has($entry)) {
 
                     // Get fieldset
@@ -576,11 +576,11 @@ class EntriesManager
                     $default_data['fieldset']  = Http::post('fieldset');
                     $default_data['date']      = date(Registry::get('settings.date_format'), time());
 
-                    // Define frontmatter values based on fieldset
+                    // Predefine data values based on selected fieldset
                     foreach ($fieldset['sections'] as $section) {
                         foreach ($section as $key => $field) {
 
-                            // Get values from default frontmatter
+                            // Get values from default data
                             if (isset($default_frontmatter[$key])) {
 
                                 $_value = $default_frontmatter[$key];
@@ -599,19 +599,16 @@ class EntriesManager
                         }
                     }
 
-                    // Delete content field from frontmatter
-                    Arr::delete($data, 'content');
+                    // Merge data
+                    $data = array_replace_recursive($data, $default_data);
 
-                    // Create a entry!
-                    if (Entries::create(
-                            $entry,
-                            array_replace_recursive($data, $default_data)
-                    )) {
+                    // Create a new entry!
+                    if (Entries::create($entry, $data)) {
                         Notification::set('success', __('admin_message_entry_created'));
                     } else {
                         Notification::set('success', __('admin_message_entry_was_not_created'));
                     }
-                    
+
                     Http::redirect(Http::getBaseUrl() . '/admin/entries/?entry=' . Http::post('parent_entry'));
                 }
             } else {