Nemcio/Grav
1
0
Fork 0
mirror of https://github.com/getgrav/grav.git synced 2026-05-07 17:56:22 +02:00
Code Issues Packages Projects Releases Activity

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

Browse Source 
# Conflicts:
#	CHANGELOG.md
This commit is contained in:
Matias Griese
2019-02-01 09:05:29 +02:00
parent e4b1d2ed9e 2fa5021a0c
commit 632a2d79b6
2 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
CHANGELOG.md
View File

@@ -176,6 +176,12 @@
* Doctrine filecache is now namespaced with prefix to support purging * Doctrine filecache is now namespaced with prefix to support purging
* Register all page types into `blueprint://pages` stream * 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 # v1.5.7
## 01/25/2019 ## 01/25/2019

4
system/src/Grav/Common/User/User.php
View File

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