Merge pull request #3421 from annando/1705-diaspora-comment

[friendica.git] / mod / ping.php

diff --git a/mod/ping.php b/mod/ping.php
index ba496a70bd87bdbbe7d00f6431077c8be192eabe..dcef73ffb252d96a1a7412d7e031aae4477d2837 100644 (file)
--- a/mod/ping.php
+++ b/mod/ping.php
@@ -305,8 +305,18 @@ function ping_init(App $a)
 
                // sort notifications by $[]['date']
                $sort_function = function($a, $b) {
-                       $adate = date($a['date']);
-                       $bdate = date($b['date']);
+                       $adate = strtotime($a['date']);
+                       $bdate = strtotime($b['date']);
+
+                       // Unseen messages are kept at the top
+                       // The value 31536000 means one year. This should be enough :-)
+                       if (!$a['seen']) {
+                               $adate += 31536000;
+                       }
+                       if (!$b['seen']) {
+                               $bdate += 31536000;
+                       }
+
                        if ($adate == $bdate) {
                                return 0;
                        }