From c15fe282dae4a37c59856a283fbdd00fbaa54ff0 Mon Sep 17 00:00:00 2001
From: Andy Miller <rhuk@mac.com>
Date: Thu, 8 Mar 2018 18:07:07 -0700
Subject: [PATCH] Fixed bug with frontmatter being killed when in `Expert Mode`
 #1345

---
 CHANGELOG.md                | 1 +
 classes/admincontroller.php | 5 ++---
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 51feea2a..db6406f6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@
     * Fixed issues with minimum PHP versions in resource upgrades
     * Fixed issue with default lang translation in admin [#1361](https://github.com/getgrav/grav-plugin-admin/issues/1361)
     * Typos in `Tools` -> `Direct Install` page [#1345](https://github.com/getgrav/grav-plugin-admin/issues/1345)
+    * Fixed bug with frontmatter being killed when in `Expert Mode` [#1345](https://github.com/getgrav/grav-plugin-admin/issues/1354)
     
 # v1.7.0-rc.3
 ## 02/15/2018
diff --git a/classes/admincontroller.php b/classes/admincontroller.php
index 48970931..c03a92d5 100644
--- a/classes/admincontroller.php
+++ b/classes/admincontroller.php
@@ -1841,9 +1841,8 @@ class AdminController extends AdminBaseController
         if (isset($input['frontmatter']) && isset($input['content'])) {
             $page->raw("---\n" . (string)$input['frontmatter'] . "\n---\n" . (string)$input['content']);
             unset($input['content']);
-        }
-
-        if (isset($input['header'])) {
+        // Handle header normally
+        } elseif (isset($input['header'])) {
             $header = $input['header'];
 
             foreach ($header as $key => $value) {