[MKDoc-commit] [1.6] Don't show events in the past with personalised event headlines

[bruno at mkdoc.demon.co.uk]

Log Message:
-----------
[1.6] Don't show events in the past with personalised event headlines

Tags:
----
mkdoc-1-6

Modified Files:
--------------
    mkd/flo/editor:
        Headlines.pm

-------------- next part --------------
Index: Headlines.pm
===================================================================
RCS file: /var/spool/cvs/mkd/flo/editor/Headlines.pm,v
retrieving revision 1.4.2.33
retrieving revision 1.4.2.34
diff -Lflo/editor/Headlines.pm -Lflo/editor/Headlines.pm -u -r1.4.2.33 -r1.4.2.34
--- flo/editor/Headlines.pm
+++ flo/editor/Headlines.pm
@@ -558,7 +558,7 @@
         $group_by     = "Document_TimeRange.ID";
 
         $extra_from   = ", Document_TimeRange";
-        $extra_where  = "AND Document.ID = Document_TimeRange.Document_ID";
+        $extra_where  = "AND Document.ID = Document_TimeRange.Document_ID AND Document_TimeRange.FromDate >= NOW()";
         $extra_select = ", Document_TimeRange.ID as Document_TimeRange_ID";
     } else {
         $order_by     = "Date_Created DESC";