From bf69c0fe46b5eced9e32bbb1ba3167536e675e13 Mon Sep 17 00:00:00 2001
From: kevin tessier <kevin@figureslibres.io>
Date: Fri, 8 Feb 2019 15:32:14 +0100
Subject: [PATCH] majgetgrav

---
 CHANGELOG.md                          | 9 ++++++++-
 system/defines.php                    | 2 +-
 system/src/Grav/Common/Page/Pages.php | 2 +-
 system/src/Grav/Common/User/User.php  | 4 ++++
 4 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 614d2c7..088dd41 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
+# v1.5.8
+## 02/07/2019
+
+1. [](#improved)
+    * Improved `User` unserialize to not to break the object if serialized data is not what expected
+    * Removed unused parameter [#2357](https://github.com/getgrav/grav/pull/2357)
+
 # v1.5.7
-## 01/25/2018
+## 01/25/2019
 
 1. [](#new)
     * Support for AWS Cloudfront forwarded scheme header [#2297](https://github.com/getgrav/grav/pull/2297)
diff --git a/system/defines.php b/system/defines.php
index 516c2b6..0c21d8d 100644
--- a/system/defines.php
+++ b/system/defines.php
@@ -8,7 +8,7 @@
 
 // Some standard defines
 define('GRAV', true);
-define('GRAV_VERSION', '1.5.7');
+define('GRAV_VERSION', '1.5.8');
 define('GRAV_TESTING', false);
 define('DS', '/');
 
diff --git a/system/src/Grav/Common/Page/Pages.php b/system/src/Grav/Common/Page/Pages.php
index ac0e41c..0c527d1 100644
--- a/system/src/Grav/Common/Page/Pages.php
+++ b/system/src/Grav/Common/Page/Pages.php
@@ -946,7 +946,7 @@ class Pages
                 $this->grav['debugger']->addMessage('Page cache missed, rebuilding pages..');
 
                 // recurse pages and cache result
-                $this->resetPages($pages_dir, $this->pages_cache_id);
+                $this->resetPages($pages_dir);
 
             } else {
                 // If pages was found in cache, set the taxonomy
diff --git a/system/src/Grav/Common/User/User.php b/system/src/Grav/Common/User/User.php
index 9cce364..c6f5dac 100644
--- a/system/src/Grav/Common/User/User.php
+++ b/system/src/Grav/Common/User/User.php
@@ -306,6 +306,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');