Merge remote-tracking branch 'origin/1.10' into 1.10

This commit is contained in:
Matias Griese
2019-08-14 20:36:42 +03:00
2 changed files with 8 additions and 5 deletions

View File

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