From: nodiscc <nodiscc@gmail.com>
Date: Fri, 22 May 2015 19:04:36 +0000 (+0200)
Subject: Merge remote-tracking branch 'Marsup/firefox-social' into next
X-Git-Tag: v0.5.0~43
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=8b3c67fccbe7e68b304d3071b1f7a77e0f1fc048;hp=d33c5d4c3b9c70441391a08e8bcb2a8c639a4635;p=github%2Fshaarli%2FShaarli.git

Merge remote-tracking branch 'Marsup/firefox-social' into next
---

diff --git a/index.php b/index.php
index fad0340c..80cf8bea 100644
--- a/index.php
+++ b/index.php
@@ -555,9 +555,12 @@ function endsWith($haystack,$needle,$case=true)
     PS: I could have used strptime(), but it does not exist on Windows. I'm too kind. */
 function linkdate2timestamp($linkdate)
 {
-    $Y=$M=$D=$h=$m=$s=0;
-    sscanf($linkdate,'%4d%2d%2d_%2d%2d%2d',$Y,$M,$D,$h,$m,$s);
-    return mktime($h,$m,$s,$M,$D,$Y);
+    if(strcmp($linkdate, '_000000') !== 0 || !$linkdate){
+        $Y=$M=$D=$h=$m=$s=0;
+        $r = sscanf($linkdate,'%4d%2d%2d_%2d%2d%2d',$Y,$M,$D,$h,$m,$s);
+        return mktime($h,$m,$s,$M,$D,$Y);
+    }
+    return time();
 }
 
 /*  Converts a linkdate time (YYYYMMDD_HHMMSS) of an article to a RFC822 date.