4 files changed, 8 insertions, 11 deletions

diff --git a/index.php b/index.php
index eb7fd103..83c507bb 100644
--- a/index.php
+++ b/index.php
@@ -1943,13 +1943,11 @@ function buildLinkList($PAGE,$LINKSDB)
         $title               = $link['title'];
         $taglist             = explode(' ',$link['tags']);
         uasort($taglist, 'strcasecmp');
-
         $classLi             = $i%2!=0 ? '' : 'publicLinkHightLight'; // This could really be done with just a css pseudoclass.
-
-        $link['description'] = nl2br(keepMultipleSpaces(text2clickable(htmlspecialchars($link['description']))));
-        $link['class']       = ($link['private']==0 ? $classLi : 'private');
-        $link['localdate']   = linkdate2locale($link['linkdate']);
-        $link['taglist']     = $taglist;
+        $link['description']=nl2br(keepMultipleSpaces(text2clickable(htmlspecialchars($link['description']))));
+        $link['class'] = ($link['private']==0 ? $classLi : 'private');
+        $link['timestamp']=linkdate2timestamp($link['linkdate']);
+        $link['taglist']=$taglist;
 
         // Convert notes to absolute URLs
         if ($link["url"][0]      === '?' && // Check for both signs of a note: starting with ? and 7 chars long. I doubt that you'll post any links that look like this.
@@ -1958,7 +1956,6 @@ function buildLinkList($PAGE,$LINKSDB)
         }
 
         $linkDisp[$keys[$i]] = $link;
-
         $i++;
     }
 
diff --git a/tpl/daily.html b/tpl/daily.html
index c53e6f71..919795bb 100644
--- a/tpl/daily.html
+++ b/tpl/daily.html
@@ -30,7 +30,7 @@
                         </div>
                         {if="!$GLOBALS['config']['HIDE_TIMESTAMPS'] || isLoggedIn()"}
                             <div class="dailyEntryLinkdate">
-                                <a href="?{$link.linkdate|smallHash}">{$link.localdate}</a>
+                                <a href="?{$link.linkdate|smallHash}">{function="strftime('%c', $link.timestamp)"}</a>
                             </div>
                         {/if}
                         {if="$link.tags"}
diff --git a/tpl/dailyrss.html b/tpl/dailyrss.html
index 436e1cd2..a9b11e18 100644
--- a/tpl/dailyrss.html
+++ b/tpl/dailyrss.html
@@ -1,6 +1,6 @@
 {loop="links"}
         <h3><a href="{$value.url}">{$value.title|htmlspecialchars}</a></h3>
-        <small>{if="!$GLOBALS['config']['HIDE_TIMESTAMPS']"}{$value.localdate|htmlspecialchars} - {/if}{if="$value.tags"}{$value.tags|htmlspecialchars}{/if}<br>
+        <small>{if="!$GLOBALS['config']['HIDE_TIMESTAMPS']"}{function="strftime('%c', $value.timestamp)"} - {/if}{if="$value.tags"}{$value.tags|htmlspecialchars}{/if}<br>
         {$value.url|htmlspecialchars}</small><br>
         {if="$value.thumbnail"}{$value.thumbnail}{/if}<br>
         {if="$value.description"}{$value.formatedDescription}{/if}
diff --git a/tpl/linklist.html b/tpl/linklist.html
index 353eca52..766a80ce 100644
--- a/tpl/linklist.html
+++ b/tpl/linklist.html
@@ -44,7 +44,7 @@
                 <br>
                 {if="$value.description"}<div class="linkdescription">{$value.description}</div>{/if}
                 {if="!$GLOBALS['config']['HIDE_TIMESTAMPS'] || isLoggedIn()"}
-                    <span class="linkdate" title="Permalink"><a href="?{$value.linkdate|smallHash}">{$value.localdate|htmlspecialchars} - permalink</a> - </span>
+                    <span class="linkdate" title="Permalink"><a href="?{$value.linkdate|smallHash}">{function="strftime('%c', $value.timestamp)"} - permalink</a> - </span>
                 {else}
                     <span class="linkdate" title="Short link here"><a href="?{$value.linkdate|smallHash}">permalink</a> - </span>
                 {/if}
@@ -53,7 +53,7 @@
                 {/if}
                 <div class="linkqrcode"><a href="http://qrfree.kaywa.com/?l=1&amp;s=8&amp;d={$scripturl|urlencode}%3F{$value.linkdate|smallHash}"
                     onclick="return showQrCode(this);" class="qrcode" data-permalink="{$scripturl}?{$value.linkdate|smallHash}">
-                    <img src="images/qrcode.png#" alt="QR-Code" title="{$value.localdate|htmlspecialchars}"></a></div> -
+                    <img src="images/qrcode.png#" alt="QR-Code" title="{function="strftime('%c', $value.timestamp)"}"></a></div> -
                 <a href="{$value.url|htmlspecialchars}"><span class="linkurl" title="Short link">{$value.url|htmlspecialchars}</span></a><br>
                 {if="$value.tags"}
                     <div class="linktaglist">