Merge remote-tracking branch 'gh-takuya-o/PHP7.0-mysqli'

[scuttle] / templates / bookmarks.tpl.php

diff --git a/templates/bookmarks.tpl.php b/templates/bookmarks.tpl.php
index c79655ea229d87fb2c6e2ed31423275583beaf19..a53559074d03f57f9a69358a7b52dabd3113d601 100644 (file)
--- a/templates/bookmarks.tpl.php
+++ b/templates/bookmarks.tpl.php
@@ -100,7 +100,11 @@ if (count($bookmarks) > 0) {
         if ($row['bDescription'] != '') {
             echo '<div class="description">'. filter($row['bDescription']) ."</div>\n";
         }
         if ($row['bDescription'] != '') {
             echo '<div class="description">'. filter($row['bDescription']) ."</div>\n";
         }

-        echo '<div class="meta">'. date($GLOBALS['shortdate'], strtotime($row['bDatetime'])) . $cats . $copy . $edit ."</div>\n";
+        if ($row['bDatetime'] == $row['bModified']) {
+            echo '<div class="meta">'. date($GLOBALS['shortdate'], strtotime($row['bDatetime'])) . $cats . $copy . $edit ."</div>\n";
+        } else {
+            echo '<div class="meta"><span id="date-updated">updated: '. date($GLOBALS['shortdate'], strtotime($row['bModified'])) . '</span>, <span id="date-original">original: '. date($GLOBALS['shortdate'], strtotime($row['bDatetime'])) . "</span>" . $cats . $copy . $edit ."</div>\n";
+        }

         echo "</li>\n";
     }
     ?>
         echo "</li>\n";
     }
     ?>