eessppeelllloo/grav
1
0
Fork 0
mirror of https://github.com/getgrav/grav.git synced 2025-12-05 15:29:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into 1.5

Browse Source 
# Conflicts:
#	CHANGELOG.md
#	composer.lock
#	system/defines.php
This commit is contained in:
Andy Miller
2018-07-31 11:27:08 -06:00
parent ead125d599 2f0d600e86
commit f7496b5341
3 changed files with 54 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
CHANGELOG.md
View File

@@ -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

83
composer.lock generated
View File

@@ -1311,16 +1311,16 @@
},
{
"name": "symfony/console",
"version": "v3.4.12",
"version": "v3.4.13",
"source": {
"type": "git",
"url": "https://github.com/symfony/console.git",
"reference": "1b97071a26d028c9bd4588264e101e14f6e7cd00"
"reference": "e54f84c50e3b12972e7750edfc5ca84b2284c44e"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/console/zipball/1b97071a26d028c9bd4588264e101e14f6e7cd00",
"reference": "1b97071a26d028c9bd4588264e101e14f6e7cd00",
"url": "https://api.github.com/repos/symfony/console/zipball/e54f84c50e3b12972e7750edfc5ca84b2284c44e",
"reference": "e54f84c50e3b12972e7750edfc5ca84b2284c44e",
"shasum": ""
},
"require": {
@@ -1376,20 +1376,20 @@
],
"description": "Symfony Console Component",
"homepage": "https://symfony.com",
"time": "2018-05-23T05:02:55+00:00"
"time": "2018-07-10T14:02:11+00:00"
},
{
"name": "symfony/debug",
"version": "v3.4.12",
"version": "v3.4.13",
"source": {
"type": "git",
"url": "https://github.com/symfony/debug.git",
"reference": "47e6788c5b151cf0cfdf3329116bf33800632d75"
"reference": "0e3ca9cbde90fffec8038f4d4e16fd4046bbd018"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/debug/zipball/47e6788c5b151cf0cfdf3329116bf33800632d75",
"reference": "47e6788c5b151cf0cfdf3329116bf33800632d75",
"url": "https://api.github.com/repos/symfony/debug/zipball/0e3ca9cbde90fffec8038f4d4e16fd4046bbd018",
"reference": "0e3ca9cbde90fffec8038f4d4e16fd4046bbd018",
"shasum": ""
},
"require": {
@@ -1432,11 +1432,11 @@
],
"description": "Symfony Debug Component",
"homepage": "https://symfony.com",
"time": "2018-06-25T11:10:40+00:00"
"time": "2018-06-26T08:45:54+00:00"
},
{
"name": "symfony/event-dispatcher",
"version": "v3.4.12",
"version": "v3.4.13",
"source": {
"type": "git",
"url": "https://github.com/symfony/event-dispatcher.git",
@@ -1672,16 +1672,16 @@
},
{
"name": "symfony/var-dumper",
"version": "v3.4.12",
"version": "v3.4.13",
"source": {
"type": "git",
"url": "https://github.com/symfony/var-dumper.git",
"reference": "e173954a28a44a32c690815fbe4d0f2eac43accb"
"reference": "c501f46bb1eaf4c8d65ba070ab65a1986da1cd7f"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/var-dumper/zipball/e173954a28a44a32c690815fbe4d0f2eac43accb",
"reference": "e173954a28a44a32c690815fbe4d0f2eac43accb",
"url": "https://api.github.com/repos/symfony/var-dumper/zipball/c501f46bb1eaf4c8d65ba070ab65a1986da1cd7f",
"reference": "c501f46bb1eaf4c8d65ba070ab65a1986da1cd7f",
"shasum": ""
},
"require": {
@@ -1737,11 +1737,11 @@
"debug",
"dump"
],
"time": "2018-06-15T07:47:49+00:00"
"time": "2018-07-09T08:21:26+00:00"
},
{
"name": "symfony/yaml",
"version": "v3.4.12",
"version": "v3.4.13",
"source": {
"type": "git",
"url": "https://github.com/symfony/yaml.git",
@@ -1927,16 +1927,16 @@
},
{
"name": "codeception/codeception",
"version": "2.4.3",
"version": "2.4.4",
"source": {
"type": "git",
"url": "https://github.com/Codeception/Codeception.git",
"reference": "13b2db0d54068afaabf3ca8ac8b6591d69018f46"
"reference": "2060fc1fe8ac2823ff3b8ece04616fc12aca968a"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/Codeception/Codeception/zipball/13b2db0d54068afaabf3ca8ac8b6591d69018f46",
"reference": "13b2db0d54068afaabf3ca8ac8b6591d69018f46",
"url": "https://api.github.com/repos/Codeception/Codeception/zipball/2060fc1fe8ac2823ff3b8ece04616fc12aca968a",
"reference": "2060fc1fe8ac2823ff3b8ece04616fc12aca968a",
"shasum": ""
},
"require": {
@@ -2014,7 +2014,7 @@
"functional testing",
"unit testing"
],
"time": "2018-06-26T14:09:28+00:00"
"time": "2018-07-16T08:14:50+00:00"
},
{
"name": "codeception/phpunit-wrapper",
@@ -2064,22 +2064,19 @@
},
{
"name": "codeception/stub",
"version": "2.0.1",
"version": "2.0.4",
"source": {
"type": "git",
"url": "https://github.com/Codeception/Stub.git",
"reference": "b2eff325d8ff0b824ff659048be7be4e5767d7d0"
"reference": "f50bc271f392a2836ff80690ce0c058efe1ae03e"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/Codeception/Stub/zipball/b2eff325d8ff0b824ff659048be7be4e5767d7d0",
"reference": "b2eff325d8ff0b824ff659048be7be4e5767d7d0",
"url": "https://api.github.com/repos/Codeception/Stub/zipball/f50bc271f392a2836ff80690ce0c058efe1ae03e",
"reference": "f50bc271f392a2836ff80690ce0c058efe1ae03e",
"shasum": ""
},
"require": {
"phpunit/phpunit-mock-objects": ">2.3 <7.0"
},
"require-dev": {
"phpunit/phpunit": ">=4.8 <8.0"
},
"type": "library",
@@ -2093,7 +2090,7 @@
"MIT"
],
"description": "Flexible Stub wrapper for PHPUnit's Mock Builder",
"time": "2018-05-18T14:33:08+00:00"
"time": "2018-07-26T11:55:37+00:00"
},
{
"name": "doctrine/instantiator",
@@ -3334,7 +3331,7 @@
},
{
"name": "symfony/browser-kit",
"version": "v3.4.12",
"version": "v3.4.13",
"source": {
"type": "git",
"url": "https://github.com/symfony/browser-kit.git",
@@ -3391,7 +3388,7 @@
},
{
"name": "symfony/css-selector",
"version": "v3.4.12",
"version": "v3.4.13",
"source": {
"type": "git",
"url": "https://github.com/symfony/css-selector.git",
@@ -3444,16 +3441,16 @@
},
{
"name": "symfony/dom-crawler",
"version": "v3.4.12",
"version": "v3.4.13",
"source": {
"type": "git",
"url": "https://github.com/symfony/dom-crawler.git",
"reference": "201b210fafcdd193c1e45b2994bf7133fb6263e8"
"reference": "54c9e817b74c7be1840344bf4feaa7a7d02abfb8"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/dom-crawler/zipball/201b210fafcdd193c1e45b2994bf7133fb6263e8",
"reference": "201b210fafcdd193c1e45b2994bf7133fb6263e8",
"url": "https://api.github.com/repos/symfony/dom-crawler/zipball/54c9e817b74c7be1840344bf4feaa7a7d02abfb8",
"reference": "54c9e817b74c7be1840344bf4feaa7a7d02abfb8",
"shasum": ""
},
"require": {
@@ -3497,11 +3494,11 @@
],
"description": "Symfony DomCrawler Component",
"homepage": "https://symfony.com",
"time": "2018-05-01T22:53:27+00:00"
"time": "2018-07-05T11:53:23+00:00"
},
{
"name": "symfony/finder",
"version": "v3.4.12",
"version": "v3.4.13",
"source": {
"type": "git",
"url": "https://github.com/symfony/finder.git",
@@ -3550,16 +3547,16 @@
},
{
"name": "symfony/process",
"version": "v3.4.12",
"version": "v3.4.13",
"source": {
"type": "git",
"url": "https://github.com/symfony/process.git",
"reference": "acc5a37c706ace827962851b69705b24e71ca17c"
"reference": "f741672edfcfe3a2ea77569d419006f23281d909"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/process/zipball/acc5a37c706ace827962851b69705b24e71ca17c",
"reference": "acc5a37c706ace827962851b69705b24e71ca17c",
"url": "https://api.github.com/repos/symfony/process/zipball/f741672edfcfe3a2ea77569d419006f23281d909",
"reference": "f741672edfcfe3a2ea77569d419006f23281d909",
"shasum": ""
},
"require": {
@@ -3595,7 +3592,7 @@
],
"description": "Symfony Process Component",
"homepage": "https://symfony.com",
"time": "2018-05-30T04:24:30+00:00"
"time": "2018-07-09T09:01:07+00:00"
},
{
"name": "victorjonsson/markdowndocs",

2
system/src/Grav/Common/Page/Page.php
View File

@@ -816,6 +816,8 @@ class Page implements PageInterface
*/
public function setRawContent($content)
{
$content = $content === null ? '': $content;
$this->content = $content;
}