majgetgrav

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

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');