Commit fdf5f675 authored by Penny Leach's avatar Penny Leach
Browse files

fixed the upgrade - I have just commented this out for now because I'm pretty...

fixed the upgrade - I have just commented this out for now because I'm pretty sure that blocktypes install themselves separately, not as part of the artefacts
parent 4ae1bfe5
......@@ -450,16 +450,19 @@ function upgrade_plugin($upgrade) {
}
$db->CompleteTrans();
/* they do themselves already
// we have to do this after committing the current transaction because we call ourselves recursively...
if ($plugintype == 'artefact' && get_config('installed')) {
// only install associated blocktype plugins if we're not in the process of installing
if ($blocktypes = call_static_method($pcname, 'get_block_types')) {
foreach ($blocktypes as $bt) {
$upgrade = check_upgrades('blocktype.' . $pluginname . '/' . $bt);
upgrade_plugin($upgrade);
if ($upgrade = check_upgrades('blocktype.' . $pluginname . '/' . $bt)) {
upgrade_plugin($upgrade);
}
}
}
}
*/
return $status;
......
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