aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authornodiscc <nodiscc@gmail.com>2015-03-15 14:24:51 +0100
committernodiscc <nodiscc@gmail.com>2015-03-15 14:24:51 +0100
commitb4b7d3343ae158e9267ad7dfa9aa69f3e9e0fdf2 (patch)
treee753ad52a7afba3761460074956e3af9134ad4bc
parentaa222440275f1cd7fb369ea1dd64a015a5b6d684 (diff)
parent4a1a1190a6c9f72f72bce7e8989541e58f366a90 (diff)
downloadShaarli-b4b7d3343ae158e9267ad7dfa9aa69f3e9e0fdf2.tar.gz
Shaarli-b4b7d3343ae158e9267ad7dfa9aa69f3e9e0fdf2.tar.zst
Shaarli-b4b7d3343ae158e9267ad7dfa9aa69f3e9e0fdf2.zip
Merge branch 'picwall-direct-link' into nextv0.0.44beta
-rw-r--r--index.php1
-rw-r--r--tpl/picwall.html2
2 files changed, 1 insertions, 2 deletions
diff --git a/index.php b/index.php
index 11f944e8..1ab34193 100644
--- a/index.php
+++ b/index.php
@@ -1271,7 +1271,6 @@ function renderPage()
1271 if ($thumb!='') // Only output links which have a thumbnail. 1271 if ($thumb!='') // Only output links which have a thumbnail.
1272 { 1272 {
1273 $link['thumbnail']=$thumb; // Thumbnail HTML code. 1273 $link['thumbnail']=$thumb; // Thumbnail HTML code.
1274 $link['permalink']=$permalink;
1275 $linksToDisplay[]=$link; // Add to array. 1274 $linksToDisplay[]=$link; // Add to array.
1276 } 1275 }
1277 } 1276 }
diff --git a/tpl/picwall.html b/tpl/picwall.html
index ea1ef420..e686afe1 100644
--- a/tpl/picwall.html
+++ b/tpl/picwall.html
@@ -9,7 +9,7 @@
9 <div id="picwall_container"> 9 <div id="picwall_container">
10 {loop="linksToDisplay"} 10 {loop="linksToDisplay"}
11 <div class="picwall_pictureframe"> 11 <div class="picwall_pictureframe">
12 {$value.thumbnail}<a href="{$value.permalink}"><span class="info">{$value.title|htmlspecialchars}</span></a> 12 {$value.thumbnail}<a href="{$value.url}"><span class="info">{$value.title|htmlspecialchars}</span></a>
13 </div> 13 </div>
14 {/loop} 14 {/loop}
15 </div> 15 </div>