From 63cc3351ba56ee172554219da969f34410f55119 Mon Sep 17 00:00:00 2001
From: Awilum <awilum@msn.com>
Date: Wed, 13 Feb 2019 18:26:02 +0300
Subject: [PATCH] Flextype Core: Site - use new Entries::fetch() method

---
 flextype/Site.php | 48 ++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 47 insertions(+), 1 deletion(-)

diff --git a/flextype/Site.php b/flextype/Site.php
index 9d652c35..85e8fe28 100644
--- a/flextype/Site.php
+++ b/flextype/Site.php
@@ -85,8 +85,34 @@ class Site
         // Event: The entry is not processed and not sent to the display.
         Event::dispatch('onCurrentEntryBeforeProcessed');
 
+        // Get uri
+        $uri = Http::getUriString();
+
+        // If uri is empty then it is main page else use entry uri
+        if ($uri === '') {
+            $entry_uri = Registry::get('settings.entries.main');
+        } else {
+            $entry_uri = $uri;
+        }
+
+        // Get entry body
+        $entry_body = Entries::fetch($entry_uri);
+
+        // If entry body is not false
+        if ($entry_body) {
+
+            // Get 404 page if entry is not published
+            if (isset($entry_body['visibility']) && ($entry_body['visibility'] === 'draft' || $entry_body['visibility'] === 'hidden')) {
+                $entry = Site::getError404Page();
+            } else {
+                $entry = $entry_body;
+            }
+        } else {
+            $entry = Site::getError404Page();
+        }
+
         // Set current requested entry data to global $entry array
-        Site::$entry = Entries::getEntry(Http::getUriString());
+        Site::$entry = $entry;
 
         // Event: The entry has been fully processed and not sent to the display.
         Event::dispatch('onCurrentEntryBeforeDisplayed');
@@ -98,6 +124,26 @@ class Site
         Event::dispatch('onCurrentEntryAfterProcessed');
     }
 
+
+    /**
+     * Get Error404 entry
+     *
+     * @return  array
+     */
+    private static function getError404Page() : array
+    {
+        Http::setResponseStatus(404);
+
+        $entry = [];
+
+        $entry['title']       = Registry::get('settings.entries.error404.title');
+        $entry['description'] = Registry::get('settings.entries.error404.description');
+        $entry['content']     = Registry::get('settings.entries.error404.content');
+        $entry['template']    = Registry::get('settings.entries.error404.template');
+
+        return $entry;
+    }
+
     /**
      * Get current entry
      *