From 8ee367e52e59048f6881ec0e496fd7a3a28bd4ba Mon Sep 17 00:00:00 2001
From: Andy Miller <rhuk@mac.com>
Date: Fri, 27 Jul 2018 15:05:45 -0600
Subject: [PATCH] Don't allow `null` to be set as Page content

---
 CHANGELOG.md                         | 1 +
 system/src/Grav/Common/Page/Page.php | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d6b56ffe5..5d68df678 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@
 1. [](#bugfix)
     * Fix for modular page preview [#2066](https://github.com/getgrav/grav/issues/2066)
     * `Page::routeCanonical()` should be string not array [#2069](https://github.com/getgrav/grav/issues/2069)
+    * Don't allow `null` to be set as Page content
 
 # v1.4.6
 ## 06/20/2018
diff --git a/system/src/Grav/Common/Page/Page.php b/system/src/Grav/Common/Page/Page.php
index 3954efe26..c4db2037c 100644
--- a/system/src/Grav/Common/Page/Page.php
+++ b/system/src/Grav/Common/Page/Page.php
@@ -813,6 +813,8 @@ class Page
      */
     public function setRawContent($content)
     {
+        $content = $content === null ? '': $content;
+
         $this->content = $content;
     }