[geeklog-cvs] geeklog: Fixed Postgres calculation of What's New interval

[geeklog-cvs at lists.geeklog.net]

changeset 7792:f2b480b608ab
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/f2b480b608ab
user: Dirk Haun <dirk at haun-online.de>
date: Sun Mar 14 18:36:18 2010 +0100
description:
Fixed Postgres calculation of What's New interval

diffstat:

 public_html/index.php      |  2 +-
 public_html/lib-common.php |  2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diffs (24 lines):

diff -r 38649567997b -r f2b480b608ab public_html/index.php
--- a/public_html/index.php	Sun Mar 14 18:31:17 2010 +0100
+++ b/public_html/index.php	Sun Mar 14 18:36:18 2010 +0100
@@ -306,7 +306,7 @@
         $sql .= "AND (date >= (date_sub(NOW(), INTERVAL {$_CONF['newstoriesinterval']} SECOND))) ";
         break;
     case 'pgsql':
-        $sql .= "AND (date >= (NOW() + INTERVAL '{$_CONF['newstoriesinterval']} SECOND')) ";
+        $sql .= "AND (date >= (NOW() - INTERVAL '{$_CONF['newstoriesinterval']} SECOND')) ";
         break;
     case 'mssql':
         $sql .= "AND (date >= (date_sub(NOW(), INTERVAL {$_CONF['newstoriesinterval']} SECOND))) ";
diff -r 38649567997b -r f2b480b608ab public_html/lib-common.php
--- a/public_html/lib-common.php	Sun Mar 14 18:31:17 2010 +0100
+++ b/public_html/lib-common.php	Sun Mar 14 18:36:18 2010 +0100
@@ -4226,7 +4226,7 @@
         // Find the newest stories
         $sql['mssql'] = "SELECT COUNT(*) AS count FROM {$_TABLES['stories']} WHERE (date >= (date_sub(NOW(), INTERVAL {$_CONF['newstoriesinterval']} SECOND))) AND (date <= NOW()) AND (draft_flag = 0)" . $archsql . COM_getPermSQL( 'AND' ) . $topicsql . COM_getLangSQL( 'sid', 'AND' );
         $sql['mysql'] = "SELECT COUNT(*) AS count FROM {$_TABLES['stories']} WHERE (date >= (date_sub(NOW(), INTERVAL {$_CONF['newstoriesinterval']} SECOND))) AND (date <= NOW()) AND (draft_flag = 0)" . $archsql . COM_getPermSQL( 'AND' ) . $topicsql . COM_getLangSQL( 'sid', 'AND' );
-        $sql['pgsql'] = "SELECT COUNT(*) AS count FROM {$_TABLES['stories']} WHERE (date >= (NOW()+ INTERVAL '{$_CONF['newstoriesinterval']} SECOND')) AND (date <= NOW()) AND (draft_flag = 0)" . $archsql . COM_getPermSQL( 'AND' ) . $topicsql . COM_getLangSQL( 'sid', 'AND' );        
+        $sql['pgsql'] = "SELECT COUNT(*) AS count FROM {$_TABLES['stories']} WHERE (date >= (NOW() - INTERVAL '{$_CONF['newstoriesinterval']} SECOND')) AND (date <= NOW()) AND (draft_flag = 0)" . $archsql . COM_getPermSQL( 'AND' ) . $topicsql . COM_getLangSQL( 'sid', 'AND' );        
         $result = DB_query( $sql );
         $A = DB_fetchArray( $result );
         $nrows = $A['count'];