summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorZach Copley <zach@controlyourself.ca>2009-07-07 20:15:05 +0000
committerZach Copley <zach@controlyourself.ca>2009-07-07 20:15:05 +0000
commit673cdab874422634a3be8afc009fbd983c73e572 (patch)
tree9511e55f65232e7e931d0ba02cef1b4a4310ac7b /lib
parent8bc924224b96928e9d41a18a83f515e5e53ba4f7 (diff)
parentd846c5fc9927b93e59192e19fd59a8d350b0e3c9 (diff)
Merge branch '0.8.x' of git@gitorious.org:laconica/dev into 0.8.x
Diffstat (limited to 'lib')
-rw-r--r--lib/popularnoticesection.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/popularnoticesection.php b/lib/popularnoticesection.php
index 375d5538b..e47c9b385 100644
--- a/lib/popularnoticesection.php
+++ b/lib/popularnoticesection.php
@@ -68,7 +68,7 @@ class PopularNoticeSection extends NoticeSection
}
$qry .= ' GROUP BY notice.id,notice.profile_id,notice.content,notice.uri,' .
'notice.rendered,notice.url,notice.created,notice.modified,' .
- 'notice.reply_to,notice.is_local,notice.source ' .
+ 'notice.reply_to,notice.is_local,notice.source,notice.conversation ' .
'ORDER BY weight DESC';
$offset = 0;