Commit da4cdf0b authored by anarcat's avatar anarcat Committed by Adrian Rossouw

make sure data is available to parse()

parent a1774f82
......@@ -68,9 +68,12 @@ class provisionConfig {
// Accept both a reference and an alias name for the owner.
$this->owner = is_object($owner) ? $owner : d($owner);
$this->data = $this->parse();
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