From 8e9d75676aacddf3c526e3a1f0c7699ff0ec1624 Mon Sep 17 00:00:00 2001
From: Awilum <awilum@msn.com>
Date: Thu, 27 Feb 2020 20:24:21 +0300
Subject: [PATCH] Flextype 0.9.7 BETA.1

---
 .../app/Controllers/EntriesController.php     | 26 +++++++++++++------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/site/plugins/admin/app/Controllers/EntriesController.php b/site/plugins/admin/app/Controllers/EntriesController.php
index 07c1174e..9c925e93 100644
--- a/site/plugins/admin/app/Controllers/EntriesController.php
+++ b/site/plugins/admin/app/Controllers/EntriesController.php
@@ -387,22 +387,25 @@ class EntriesController extends Controller
      */
     public function typeProcess(Request $request, Response $response) : Response
     {
-        $_data = $request->getParsedBody();
+        $post_data = $request->getParsedBody();
 
-        $id = $_data['id'];
+        $id = $post_data['id'];
 
         $entry = $this->entries->fetch($id);
 
         Arr::delete($entry, 'slug');
         Arr::delete($entry, 'modified_at');
-        Arr::delete($_data, 'csrf_name');
-        Arr::delete($_data, 'csrf_value');
-        Arr::delete($_data, 'save_entry');
-        Arr::delete($_data, 'id');
+        Arr::delete($entry, 'created_at');
+        Arr::delete($entry, 'published_at');
 
-        $_data['published_by'] = Session::get('uuid');
+        Arr::delete($post_data, 'csrf_name');
+        Arr::delete($post_data, 'csrf_value');
+        Arr::delete($post_data, 'save_entry');
+        Arr::delete($post_data, 'id');
 
-        $data = array_merge($entry, $_data);
+        $post_data['published_by'] = Session::get('uuid');
+
+        $data = array_merge($entry, $post_data);
 
         if ($this->entries->update(
             $id,
@@ -694,6 +697,9 @@ class EntriesController extends Controller
         is_null($fieldsets) and $fieldsets = [];
 
         if ($type == 'source') {
+            $entry['published_at'] = date($this->registry->get('flextype.date_format'), $entry['published_at']);
+            $entry['created_at'] = date($this->registry->get('flextype.date_format'), $entry['created_at']);
+
             return $this->view->render(
                 $response,
                 'plugins/admin/templates/content/entries/source.html',
@@ -844,6 +850,10 @@ class EntriesController extends Controller
 
             $entry['published_by'] = Session::get('uuid');
 
+            Arr::delete($entry, 'slug');
+            Arr::delete($entry, 'modified_at');
+            Arr::delete($entry, 'created_at');
+
             // Update entry
             if (Filesystem::write(PATH['entries'] . '/' . $id . '/entry.md', $this->parser->encode($entry, 'frontmatter'))) {
                 $this->flash->addMessage('success', __('admin_message_entry_changes_saved'));