Merge branch 'picwall-direct-link' into next

diff --git a/index.php b/index.php
index 11f944e800d7e7923f743746ec52767c4cc2a9bf..1ab34193a3e8505c1a5f4f6e6ce925941210e0cc 100644 (file)
--- 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 ea1ef420d1123d3bda5d1489e4f03ad6972991ec..e686afe18a806272aea673dbf41c1eeb4ee28247 100644 (file)
--- 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>