Merge branch 'develop' into 1.5

# Conflicts: # CHANGELOG.md # composer.lock # system/defines.php
getgrav · Jul 31, 2018 · f7496b5 · f7496b5
2 parents ead125d + 2f0d600
commit f7496b5
Show file tree

Hide file tree

Showing 3 changed files with 54 additions and 45 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,4 @@
-# v1.5.0-beta.3
+# v1.5.0-rc.1
 ## mm/dd/2018
 
 1. [](#new)
@@ -38,6 +38,16 @@
     * Fixed typo in truncate function [#1943](https://github.com/getgrav/grav/issues/1943)
     * Fixed blueprint field validation: Allow numeric inputs in text fields
 
+# v1.4.8
+## 07/31/2018
+
+1. [](#improved)
+    * Add Grav version to debug bar messages tab [#2106](https://github.com/getgrav/grav/pull/2106)
+    * Add Nginx config for ddev project to `webserver-configs` [#2117](https://github.com/getgrav/grav/pull/2117)
+    * Vendor library updates
+1. [](#bugfix)
+    * Don't allow `null` to be set as Page content
+
 # v1.4.7
 ## 07/13/2018
 
@@ -46,7 +56,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)
-
+    
 # v1.4.6
 ## 06/20/2018
 

diff --git a/composer.lock b/composer.lock
diff --git a/system/src/Grav/Common/Page/Page.php b/system/src/Grav/Common/Page/Page.php
@@ -816,6 +816,8 @@ public function getRawContent()
      */
     public function setRawContent($content)
     {
+        $content = $content === null ? '': $content;
+
         $this->content = $content;
     }
-Original file line number
+Diff line change
@@ Expand Up / @@ -816,6 +816,8 @@ public function getRawContent() @@
          */
         public function setRawContent($content)
         {
+            $content = $content === null ? '': $content;
             $this->content = $content;
         }
@@ Expand Down @@