3.4.0

2020-07-07 12:40:13 +02:00
parent 5f025ac2c2
commit f79d2e960c
176 changed files with 10532 additions and 5343 deletions
--- a/kirby/src/Cms/Users.php
+++ b/kirby/src/Cms/Users.php
@@ -3,6 +3,7 @@
 namespace Kirby\Cms;

 use Kirby\Toolkit\Dir;
+use Kirby\Toolkit\F;
 use Kirby\Toolkit\Str;

 /**
@@ -109,8 +110,9 @@ class Users extends Collection
            }

            // get role information
-            if (file_exists($root . '/' . $userDirectory . '/index.php') === true) {
-                $credentials = require $root . '/' . $userDirectory . '/index.php';
+            $path = $root . '/' . $userDirectory . '/index.php';
+            if (is_file($path) === true) {
+                $credentials = F::load($path);
            }

            // create user model based on role