Merge branch 'picwall-direct-link' into next

shaarli · Mar 15, 2015 · b4b7d33 · b4b7d33 · alexisju · Mar 26, 2015
2 parents aa22244 + 4a1a119
commit b4b7d33
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git 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
@@ -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>