From 96d11e4ffa5040fc6fd659218f55e60b1ad36af0 Mon Sep 17 00:00:00 2001 From: Matias Griese Date: Mon, 25 May 2020 22:18:30 +0300 Subject: [PATCH] Fixed new `Flex User` erroring out on save (thanks @mikebi42) --- CHANGELOG.md | 1 + system/src/Grav/Common/Flex/Types/Users/UserIndex.php | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4f608c5d3..cffe84431 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ * Changed `Folder::hasChildren` to `Folder::countChildren` 1. [](#bugfix) * Fixed new `Flex Page` not having correct form fields for the page type + * Fixed new `Flex User` erroring out on save (thanks @mikebi42) * Fixed blueprint value filtering in lists [#2923](https://github.com/getgrav/grav/issues/2923) # v1.7.0-rc.11 diff --git a/system/src/Grav/Common/Flex/Types/Users/UserIndex.php b/system/src/Grav/Common/Flex/Types/Users/UserIndex.php index 2c9ccd8c4..56c95376f 100644 --- a/system/src/Grav/Common/Flex/Types/Users/UserIndex.php +++ b/system/src/Grav/Common/Flex/Types/Users/UserIndex.php @@ -57,7 +57,7 @@ class UserIndex extends FlexIndex public static function updateObjectMeta(array &$meta, array $data) { // Username can also be number and stored as such. - $key = (string)($data['username'] ?? $meta['key']); + $key = (string)($data['username'] ?? $meta['key'] ?? $meta['storage_key']); $meta['key'] = mb_strtolower($key); $meta['email'] = isset($data['email']) ? mb_strtolower($data['email']) : null; }