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 /lib/popularnoticesection.php | |
| parent | 5bdc6fa5d456c3f520d8124950684220d8f440a3 (diff) | |
| parent | 5a1cbdc6f1e32be7b8430924a1125422d8457584 (diff) | |
Merge branch 'master' of gitorious.org:statusnet/mainline into testing
Diffstat (limited to 'lib/popularnoticesection.php')
| -rw-r--r-- | lib/popularnoticesection.php | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/lib/popularnoticesection.php b/lib/popularnoticesection.php index fbf9a60ab..296ddbbb5 100644 --- a/lib/popularnoticesection.php +++ b/lib/popularnoticesection.php @@ -59,12 +59,15 @@ class PopularNoticeSection extends NoticeSection } } $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 "; if(isset($tag)) { $qry .= 'FROM notice_tag, notice JOIN fave ON notice.id = fave.notice_id ' . - "WHERE notice.id = notice_tag.notice_id and '$tag' = notice_tag.tag"; + "WHERE $cutoff and notice.id = notice_tag.notice_id and '$tag' = notice_tag.tag"; } else { - $qry .= 'FROM notice JOIN fave ON notice.id = fave.notice_id'; + $qry .= 'FROM notice JOIN fave ON notice.id = fave.notice_id ' . + "WHERE $cutoff"; } $qry .= ' GROUP BY notice.id,notice.profile_id,notice.content,notice.uri,' . 'notice.rendered,notice.url,notice.created,notice.modified,' . |