From 1d7fbe42d3cedaac68194f33401ec8e2d70269ac Mon Sep 17 00:00:00 2001 From: Matias Griese Date: Tue, 2 Feb 2016 14:31:10 +0200 Subject: [PATCH] Blueprints: Fix form ordering in @import --- system/src/Grav/Common/Data/Blueprint.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/system/src/Grav/Common/Data/Blueprint.php b/system/src/Grav/Common/Data/Blueprint.php index 869e06391..d778a9581 100644 --- a/system/src/Grav/Common/Data/Blueprint.php +++ b/system/src/Grav/Common/Data/Blueprint.php @@ -286,8 +286,9 @@ class Blueprint extends BaseBlueprints implements ExportInterface $file = CompiledYamlFile::instance($filename); $blueprint = (new Blueprint($type, $file->content(), $this->context))->init('static'); - //$this->embed($field['name'], $blueprint->toArray(), '.', -1); - $this->parseFormFields($blueprint->toArray()['form']['fields'], $this->filter, '', $field['name'].'.', -1, $call['form']); + $fields = $this->parseFormFields($blueprint->toArray()['form']['fields'], $this->filter, '', $field['name'].'.', -1, $call['form']); + + $this->setFormFields($call['form'], $fields); } /**