Merge branch '0.7.x' into 0.8.x

Conflicts:

	classes/Notice.php
	lib/action.php
	lib/router.php
	lib/twitter.php

1 files changed, 3 insertions, 1 deletions

diff --git a/actions/sup.php b/actions/sup.php
index f4b1cda23..8ef9207fa 100644
--- a/actions/sup.php
+++ b/actions/sup.php
@@ -65,7 +65,9 @@ class SupAction extends Action
 
         $notice->query('SELECT profile_id, max(id) AS max_id ' .
                        'FROM notice ' .
-                       'WHERE created > (now() - ' . $seconds . ') ' .
+                        ((common_config('db','type') == 'pgsql') ?
+                       'WHERE extract(epoch from created) > (extract(epoch from now()) - ' . $seconds . ') ' :
+                       'WHERE created > (now() - ' . $seconds . ') ' ) .
                        'GROUP BY profile_id');
 
         $updates = array();