Commit 30a3e92f authored by Aaron Wells's avatar Aaron Wells Committed by Gerrit Code Review
Browse files

Merge "Don't disable Dwoo autoescape in template files" into 1.9_STABLE

parents 66a0641a ccc6569f
......@@ -49,5 +49,5 @@ $smarty = smarty(array(), $css, array(), array());
$smarty->assign('skins', $data->data);
$smarty->assign('siteskins', true);
$smarty->assign('pagination', $pagination['html']);
$smarty->assign('PAGEHEADING', hsc(TITLE));
$smarty->assign('PAGEHEADING', TITLE);
$smarty->display('skin/index.tpl');
......@@ -370,7 +370,8 @@ class Skin {
}
$owner = new User();
$owner->find_by_id($skindata[$i]->owner);
$data[$i]['metadata'] = array('displayname' => '<a href="' . get_config('wwwroot') . 'user/view.php?id=' . $skindata[$i]->owner . '">' . display_name($owner) . '</a>',
$data[$i]['metadata'] = array('displayname' => display_name($owner),
'profileurl' => profile_url($owner),
'description' => nl2br($skindata[$i]->description),
'ctime' => format_date(strtotime($skindata[$i]->ctime)),
'mtime' => format_date(strtotime($skindata[$i]->mtime)),
......
......@@ -124,7 +124,7 @@ $smarty->assign('id', $id);
$smarty->assign('metadata', $metadata);
$smarty->assign('filter', $filter);
$smarty->assign('pagination', $pagination['html']);
$smarty->assign('PAGEHEADING', hsc(TITLE));
$smarty->assign('PAGEHEADING', TITLE);
$smarty->display('skin/index.tpl');
function filter_submit(Pieform $form, $values) {
......
{auto_escape off}
{include file="header.tpl"}
<div class="rbuttons">
......@@ -13,7 +12,7 @@
</form>
</div>
{if !$siteskins}
{$form}
{$form|safe}
{/if}
{if $skins}
{foreach from=$skins item=skin}
......@@ -62,16 +61,16 @@
<div class="skin-metadata {if $id eq $skin.id && $metadata}show{else}hidden{/if}">
<input type="image" class="metadataclose" src="{theme_url images/btn_close.png}" alt="{str tag=closemetadata section=skin}" title="{str tag=closemetadata section=skin}" />
<div class="metadatatitle"><h2 class="title">{str tag=metatitle section=skin}</h2></div>
<div class="metatitle"><span>{str tag=title section=skin}:</span> {$skin.title|escape}</div>
<div class="metadisplayname"><span>{str tag=displayname section=skin}:</span> {$skin.metadata.displayname}</div>
<div class="metadescription"><span>{str tag=description section=skin}:</span><br>{$skin.metadata.description|clean_html|safe}</div>
<div class="metatitle"><span>{str tag=title section=skin}:</span> {$skin.title}</div>
<div class="metadisplayname"><span>{str tag=displayname section=skin}:</span> <a href="{$skin.metadata.profileurl}">{$skin.metadata.displayname}</a></div>
<div class="metadescription"><span>{str tag=description section=skin}:</span><br>{$skin.metadata.description}</div>
<div class="metacreationdate"><span>{str tag=creationdate section=skin}:</span> {$skin.metadata.ctime}</div>
<div class="metamodifieddate"><span>{str tag=modifieddate section=skin}:</span> {$skin.metadata.mtime}</div>
</div>
{/if}
</div>
<div class="skin-header">
<h2 class="title">{$skin.title|escape}</h2>
<h2 class="title">{$skin.title}</h2>
</div>
<div class="skin-content">
{if $skin.editable}
......@@ -84,7 +83,7 @@
</div>
</div>
{/foreach}
<div class="cb">{$pagination}</div>
<div class="cb">{$pagination|safe}</div>
{else}
<div class="message">{str tag="noskins" section="skin"}</div>
{/if}
......
{auto_escape off}
{include file="header.tpl"}
<div class="rbuttons">
<form method="post" action="{$WWWROOT}admin/site/font/install.php">
......@@ -41,5 +40,5 @@
{else}
<div class="message">{str tag="nofonts" section="skin"}</div>
{/if}
{$pagination}
{$pagination|safe}
{include file="footer.tpl"}
\ No newline at end of file
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