Upgrade to 3.1.2

2019-04-09 14:34:12 +02:00
parent 852a14595e
commit eb29ef6d6c
58 changed files with 535 additions and 258 deletions
--- a/kirby/src/Toolkit/Collection.php
+++ b/kirby/src/Toolkit/Collection.php
@@ -349,6 +349,9 @@ class Collection extends Iterator implements Countable

        foreach ($keys as $key) {
            if ($item = $this->findByKey($key)) {
+                if (is_object($item) && method_exists($item, 'id') === true) {
+                    $key = $item->id();
+                }
                $result[$key] = $item;
            }
        }