Fixed issue with deleting files in config based YAML files

# Conflicts:
#	CHANGELOG.md
This commit is contained in:
Andy Miller
2019-08-09 16:45:31 -06:00
parent 0e3661b45d
commit 741e2285e5
2 changed files with 8 additions and 5 deletions

View File

@@ -70,6 +70,9 @@
* Fixed 2FA regenerate for Flex Users * Fixed 2FA regenerate for Flex Users
* Added missing closing </li> in language loops * Added missing closing </li> in language loops
* Fixed issue with nested `list` fields both utilizing the custom `key` functionality * Fixed issue with nested `list` fields both utilizing the custom `key` functionality
* Fixed issue with `array` field nested in `list` that were losing their index order when the list reordered
* Fixed file form field failing resolution checks in certain circumstances
* Fixed issue with deleting files in config based YAML files
# v1.9.7 # v1.9.7
## 06/21/2019 ## 06/21/2019

View File

@@ -907,11 +907,11 @@ class AdminBaseController
$settings = (object)$blueprints->schema()->getProperty($field); $settings = (object)$blueprints->schema()->getProperty($field);
} else { } else {
$page = null; $page = null;
if ($type === 'user') { if ($type === 'themes') {
$settings = (object)$this->admin->blueprints($blueprint)->schema()->getProperty($field); $obj = $this->grav[$type]->get(Utils::substrToString($blueprint, '/')); //here
$settings = (object) $obj->blueprints()->schema()->getProperty($field);
} else { } else {
$obj = $this->grav[$type]->get(Utils::substrToString($blueprint, '/')); $settings = (object)$this->admin->blueprints($blueprint)->schema()->getProperty($field);
$settings = (object)$obj->blueprints()->schema()->getProperty($field);
} }
} }