Don't allow null to be set as Page content

getgrav · Jul 27, 2018 · 8ee367e · 8ee367e
1 parent c9367ba
commit 8ee367e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git 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
@@ -813,6 +813,8 @@ public function getRawContent()
      */
     public function setRawContent($content)
     {
+        $content = $content === null ? '': $content;
+
         $this->content = $content;
     }
-Original file line number
+Diff line change
@@ Expand Up / @@ -813,6 +813,8 @@ public function getRawContent() @@
          */
         public function setRawContent($content)
         {
+            $content = $content === null ? '': $content;
             $this->content = $content;
         }
@@ Expand Down @@