diff options
| author | Brion Vibber <brion@pobox.com> | 2010-02-04 11:56:07 -0800 |
|---|---|---|
| committer | Brion Vibber <brion@pobox.com> | 2010-02-04 11:56:07 -0800 |
| commit | a020e230860358fc8b63cd56872bbad0446016e0 (patch) | |
| tree | ca2788c034526d53424079004ba6a726485a1e25 /actions/favorited.php | |
| parent | 5bdc6fa5d456c3f520d8124950684220d8f440a3 (diff) | |
| parent | 5a1cbdc6f1e32be7b8430924a1125422d8457584 (diff) | |
Merge branch 'master' of gitorious.org:statusnet/mainline into testing
Diffstat (limited to 'actions/favorited.php')
| -rw-r--r-- | actions/favorited.php | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/actions/favorited.php b/actions/favorited.php index 9ffa5b844..d8980440d 100644 --- a/actions/favorited.php +++ b/actions/favorited.php @@ -186,10 +186,13 @@ class FavoritedAction extends Action function showContent() { $weightexpr = common_sql_weight('fave.modified', common_config('popular', 'dropoff')); + $cutoff = sprintf("fave.modified > '%s'", + common_sql_date(time() - common_config('popular', 'cutoff'))); $qry = 'SELECT notice.*, '. $weightexpr . ' as weight ' . 'FROM notice JOIN fave ON notice.id = fave.notice_id ' . + "WHERE $cutoff " . 'GROUP BY id,profile_id,uri,content,rendered,url,created,notice.modified,reply_to,is_local,source,notice.conversation ' . 'ORDER BY weight DESC'; |