From 6d03d638c3cbad3ec2e78ba224b5e75d7da60fb6 Mon Sep 17 00:00:00 2001
From: Andy Miller <rhuk@mac.com>
Date: Mon, 14 Jan 2019 11:48:58 -0700
Subject: [PATCH] Fixed issue with incorrect setting page to be modular #1573

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1ca935fc..57e4a538 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@
     * v.1.8.16 fixes merged in
 1. [](#bugfix)
     * Removed `tabs`, `tab`, and `toggle` fields as they are now in Form plugin
+    * Fix issue with new page always showing modular page templates [#1573](https://github.com/getgrav/grav-plugin-admin/issues/1573)
 
 # v1.9.0-beta.7
 ## 12/14/2018
diff --git a/classes/admin.php b/classes/admin.php
index b6531bb5..3b39c5dc 100644
--- a/classes/admin.php
+++ b/classes/admin.php
@@ -1476,7 +1476,7 @@ class Admin
             $pages->addPage($page, $path);
 
             // Set if Modular
-            $page->modularTwig($slug[0] ?? '' === '_');
+            $page->modularTwig($slug[0] === '_');
 
             // Determine page type.
             if (isset($this->session->{$page->route()})) {
@@ -1524,7 +1524,6 @@ class Admin
                 $page->name($type . CONTENT_EXT);
                 $page->header();
             }
-            $page->modularTwig($slug[0] ?? '' === '_');
         }
 
         return $page;