diff options
| author | Evan Prodromou <evan@status.net> | 2010-02-06 11:24:12 +0100 |
|---|---|---|
| committer | Evan Prodromou <evan@status.net> | 2010-02-06 11:24:12 +0100 |
| commit | 823939ca84bd19ced394771d3f08b7c72a9dec84 (patch) | |
| tree | a35918d128f8a70e5e5ab8a4de9c38aae0c4ce7a /actions/favorited.php | |
| parent | 900cb8dd91b954d4e720b0c8afb2884419f43cd7 (diff) | |
| parent | fc226a6ad5c4b120858b70d3af4d6f9c288d08d6 (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'; |