Commit 7cdccd52 authored by anarcat's avatar anarcat Committed by anarcat

make sure data is available to parse()

parent cace612b
...@@ -26,10 +26,12 @@ class provisionConfig { ...@@ -26,10 +26,12 @@ class provisionConfig {
throw(exception); throw(exception);
} }
$this->owner = d($owner); $this->owner = d($owner);
$this->data = $this->parse(); // we need to do this first so it's accessible to parse()
if (sizeof($data)) { if (sizeof($data)) {
$this->data = array_merge($this->data, $data); $this->data = $data;
} }
$this->parsed_data = $this->parse();
$this->data = array_merge($this->parsed_data, $this->data);
} }
/** /**
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment