Commit 31966be5 authored by Richard Mansfield's avatar Richard Mansfield Committed by Gerrit Code Review
Browse files

Merge "Initilization the property 'artefactplugin' of BlockInstance"

parents 4bad96b1 5f7f59f4
......@@ -465,6 +465,7 @@ class BlockInstance {
$this->{$field} = $value;
}
}
$this->artefactplugin = blocktype_artefactplugin($this->blocktype);
}
public function get($field) {
......
......@@ -1712,8 +1712,8 @@ class View {
foreach($instancejs as &$jsfile) {
$jsfile = (is_array($jsfile) && isset($jsfile['file'])) ? $jsfile['file'] : $jsfile;
if(strpos($jsfile, 'http://') === false) {
if ($artefactplugin = blocktype_artefactplugin($pluginname)) {
$jsfile = 'artefact/' . $artefactplugin . '/blocktype/' .
if ($blockinstance->get('artefactplugin')) {
$jsfile = 'artefact/' . $blockinstance->get('artefactplugin') . '/blocktype/' .
$pluginname . '/' . $jsfile;
}
else {
......
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