[php-blog-cvs] serendipity NEWS,1.111,1.112 serendipity_functions.inc.php,1.255,1.256

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7082

Modified Files:
	NEWS serendipity_functions.inc.php 
Log Message:
Published entries from the future will only be displayed on the
frontend when not in the future. They will get automagically displayed
as soon as the publish time is effectively reached.      
#RFE 939867



Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.255
retrieving revision 1.256
diff -u -d -r1.255 -r1.256
--- serendipity_functions.inc.php	23 Apr 2004 16:12:03 -0000	1.255
+++ serendipity_functions.inc.php	26 Apr 2004 07:30:36 -0000	1.256
@@ -201,7 +201,6 @@
 
 function serendipity_displayCommentForm($id, $url = '?') {
     global $serendipity;
-
 ?>
 <div class="serendipityCommentForm">
     <form <?php echo ($serendipity['XHTML11'] ? 'id' : 'name'); ?>="serendipity_comment" action="<?php echo $url; ?>" method="post" onsubmit="if (this.serendipity_remember.checked) rememberMe(this, '<?php echo $_SERVER['HTTP_HOST']; ?>')">
@@ -604,6 +603,14 @@
         }
     }
 
+    if (!isset($serendipity['GET']['adminModule'])) {
+        if (!empty($and)) {
+            $and .= " AND e.timestamp <= '" . time() . "'";
+        } else {
+            $and = "WHERE e.timestamp <= '" . time() . "'";
+        }
+    }
+
     $query = "SELECT
                     e.id,
                     e.title,
@@ -2044,7 +2051,7 @@
     } else {
         $edit_cat=1;
     }
-    
+
     $n = "\n";
     if ($edit_cat) {
         $cat_list = '<select name="serendipity[categoryid]">' . $n;

Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/NEWS,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -d -r1.111 -r1.112
--- NEWS	17 Apr 2004 11:30:42 -0000	1.111
+++ NEWS	26 Apr 2004 07:30:34 -0000	1.112
@@ -3,6 +3,11 @@
 Version 0.6.1 ()
 ------------------------------------------------------------------------
 
+    * Published entries from the future will only be displayed on the
+      frontend when not in the future. They will get automagically
+      displayed as soon as the publish time is effectively reached.
+      #RFE 939867 (garvinhicking)
+
     * Exit/Referrer plugin can now limit the number of elements
       (garvinhicking)