Commit 90d88b20 authored by Richard Mansfield's avatar Richard Mansfield
Browse files

Merge aab7fa9edf7ef6e0c345df41de7b37bdc775039c

parent 5e4212c5
......@@ -367,7 +367,7 @@ function template_render($template, $mode, $data=array(), $view_id=null) {
'format' => isset($t['format']) ? $t['format'] : null,
'options' => $options,
);
if ( isset($data[$t['id']]) ) {
$format = FORMAT_ARTEFACT_LISTSELF;
......
......@@ -280,10 +280,8 @@ class View {
$data = array();
foreach ($artefacts as $artefact) {
$data[$artefact->block] = array(
'id' => $artefact->id,
'format' => $artefact->format
);
$data[$artefact->block]['format'] = $artefact->format;
$data[$artefact->block]['id'][] = $artefact->id;
}
foreach ($contents as $content) {
$data[$content->block] = array(
......
Supports Markdown
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