Commit 2633a8d5 authored by Nigel McNie's avatar Nigel McNie
Browse files

Rename the smarty variable $type to $leaptype to prevent confusing it with $contenttype.

parent 71b9e2d3
......@@ -49,7 +49,7 @@ class LeapExportElementInternal extends LeapExportElement {
$this->smarty->assign('title', display_name($this->get('exporter')->get('user'), $this->get('exporter')->get('user')));
// If this ID is changed, you'll have to change it in author.tpl too
$this->smarty->assign('id', 'portfolio:artefactinternal');
$this->smarty->assign('type', $this->get_leap_type());
$this->smarty->assign('leaptype', $this->get_leap_type());
$persondata = array();
$spacialdata = array();
foreach ($this->artefacts as $a) {
......
......@@ -270,7 +270,7 @@ abstract class LeapExportElementResumeCompositeChild extends LeapExportElement {
}
$this->smarty->assign($field, $value);
}
$this->smarty->assign('type', $this->get_leap_type());
$this->smarty->assign('leaptype', $this->get_leap_type());
$this->smarty->assign('contenttype', 'text');
$this->add_links();
$this->smarty->assign('links', $this->links);
......
......@@ -210,7 +210,7 @@ class PluginExportLeap extends PluginExport {
//$this->smarty->assign('summary', $view->get('description'));
$this->smarty->assign('contenttype', 'html');
$this->smarty->assign('content', $view->build_columns());
$this->smarty->assign('type', 'selection');
$this->smarty->assign('leaptype', 'selection');
$this->smarty->assign('categories', array(
array(
'scheme' => 'selection_type',
......@@ -375,7 +375,7 @@ class LeapExportElement {
$this->add_links();
$this->smarty->assign('content', $this->get_content());
$this->smarty->assign('contenttype', $this->get_content_type());
$this->smarty->assign('type', $this->get_leap_type());
$this->smarty->assign('leaptype', $this->get_leap_type());
if ($tags = $this->artefact->get('tags')) {
$tags = array_map(create_function('$a',
......
......@@ -8,7 +8,7 @@
{if $summary} <summary>{$summary}</summary>
{/if}
<content{if $contenttype != 'text'} type="{$contenttype}"{/if}{if $contentsrc} src="{$contentsrc}"{/if}>{if $contenttype == 'xhtml'}<div xmlns="http://www.w3.org/1999/xhtml">{/if}{if $contenttype == 'xhtml'}{$content|clean_html}{elseif $contenttype == 'html'}{$content|clean_html|escape}{else}{$content|escape}{/if}{if $contenttype == 'xhtml'}</div>{/if}</content>
<rdf:type rdf:resource="leaptype:{$type}"/>
<rdf:type rdf:resource="leaptype:{$leaptype}"/>
{if $artefacttype} <mahara:artefactplugin mahara:type="{$artefacttype}" mahara:plugin="{$artefactplugin}"/>
{/if}
{include file="export:leap:links.tpl"}
......
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