diff options
| author | Zach Copley <zach@status.net> | 2010-02-05 02:08:37 +0000 |
|---|---|---|
| committer | Zach Copley <zach@status.net> | 2010-02-05 02:08:37 +0000 |
| commit | 8d320d7cc2998a4977c5de4ba571ea4f95b21dce (patch) | |
| tree | eb8903c9a07126b88e4112de5d83a22dba2a1073 /actions/favorited.php | |
| parent | 10dfcde0b2099a169ccd3af0ecfbf2de9da551d6 (diff) | |
| parent | 509c8fc51589a4cc6a3281e012ce759ab9bed532 (diff) | |
Merge branch 'testing' of git@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'; |