Merge branch 'picwall-direct-link' into next

This commit is contained in:
nodiscc 2015-03-15 14:24:51 +01:00
commit b4b7d3343a
2 changed files with 1 additions and 2 deletions

View file

@ -1271,7 +1271,6 @@ function renderPage()
if ($thumb!='') // Only output links which have a thumbnail. if ($thumb!='') // Only output links which have a thumbnail.
{ {
$link['thumbnail']=$thumb; // Thumbnail HTML code. $link['thumbnail']=$thumb; // Thumbnail HTML code.
$link['permalink']=$permalink;
$linksToDisplay[]=$link; // Add to array. $linksToDisplay[]=$link; // Add to array.
} }
} }

View file

@ -9,7 +9,7 @@
<div id="picwall_container"> <div id="picwall_container">
{loop="linksToDisplay"} {loop="linksToDisplay"}
<div class="picwall_pictureframe"> <div class="picwall_pictureframe">
{$value.thumbnail}<a href="{$value.permalink}"><span class="info">{$value.title|htmlspecialchars}</span></a> {$value.thumbnail}<a href="{$value.url}"><span class="info">{$value.title|htmlspecialchars}</span></a>
</div> </div>
{/loop} {/loop}
</div> </div>