Merge branch 'develop' of https://github.com/getgrav/grav into 1.6

# Conflicts:
#	CHANGELOG.md
This commit is contained in:
Matias Griese
2019-02-01 09:05:29 +02:00
2 changed files with 10 additions and 0 deletions

View File

@@ -176,6 +176,12 @@
* Doctrine filecache is now namespaced with prefix to support purging
* Register all page types into `blueprint://pages` stream
# v1.5.8
## mm/dd/2019
1. [](#improved)
* Improved `User` unserialize to not to break the object if serialized data is not what expected
# v1.5.7
## 01/25/2019

View File

@@ -341,6 +341,10 @@ class User extends Data
$this->gettersVariable = 'items';
$this->nestedSeparator = '.';
if (null === $this->items) {
$this->items = [];
}
if (null === $this->blueprints) {
$blueprints = new Blueprints;
$this->blueprints = $blueprints->get('user/account');