From 20a596f18fe2fba6daa9ccdfa002e2bc25cde446 Mon Sep 17 00:00:00 2001
From: Matias Griese <matias@trilbymedia.com>
Date: Tue, 9 Apr 2019 10:36:13 +0300
Subject: [PATCH] Regression from beta.8: Deleting files other than from
 plugins/themes fail on error

---
 CHANGELOG.md                    | 1 +
 classes/adminbasecontroller.php | 8 ++++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 721a5be7..b9e6f6f6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,7 @@
     * Fixed user edit links if Flex Objects plugin is installed but user isn't Flex User
     * Fixed deprecated `sameas()` Twig test
     * Regression: Fixed lost user access when saving user profile without super user permissions [#1639](https://github.com/getgrav/grav-plugin-admin/issues/1639)
+    * Regression from beta.8: Deleting files other than from plugins/themes fail on error
 
 # v1.9.0-rc.4
 ## 03/20/2019
diff --git a/classes/adminbasecontroller.php b/classes/adminbasecontroller.php
index bee503f1..bd11c7a2 100644
--- a/classes/adminbasecontroller.php
+++ b/classes/adminbasecontroller.php
@@ -941,8 +941,12 @@ class AdminBaseController
             $settings = (object)$blueprints->schema()->getProperty($field);
         } else {
             $page = null;
-            $obj = $this->grav[$type]->get(Utils::substrToString($blueprint, '/'));
-            $settings = (object)$obj->blueprints()->schema()->getProperty($field);
+            if ($type === 'user') {
+                $settings = (object)$this->admin->blueprints($blueprint)->schema()->getProperty($field);
+            } else {
+                $obj = $this->grav[$type]->get(Utils::substrToString($blueprint, '/'));
+                $settings = (object)$obj->blueprints()->schema()->getProperty($field);
+            }
         }
 
         // Get destination