From: nodiscc <nodiscc@gmail.com>
Date: Sun, 15 Mar 2015 13:24:51 +0000 (+0100)
Subject: Merge branch 'picwall-direct-link' into next
X-Git-Tag: v0.0.44beta
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=b4b7d3343ae158e9267ad7dfa9aa69f3e9e0fdf2;hp=aa222440275f1cd7fb369ea1dd64a015a5b6d684;p=github%2Fshaarli%2FShaarli.git

Merge branch 'picwall-direct-link' into next
---

diff --git a/index.php b/index.php
index 11f944e8..1ab34193 100644
--- a/index.php
+++ b/index.php
@@ -1271,7 +1271,6 @@ function renderPage()
             if ($thumb!='') // Only output links which have a thumbnail.
             {
                 $link['thumbnail']=$thumb; // Thumbnail HTML code.
-                $link['permalink']=$permalink;
                 $linksToDisplay[]=$link; // Add to array.
             }
         }
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 @@
         <div id="picwall_container">
             {loop="linksToDisplay"}
             <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>
             {/loop}
         </div>