summaryrefslogtreecommitdiff
path: root/actions
diff options
context:
space:
mode:
authorCiaranG <ciaran@ciarang.com>2009-07-07 20:53:28 +0100
committerCiaranG <ciaran@ciarang.com>2009-07-07 20:53:28 +0100
commitd846c5fc9927b93e59192e19fd59a8d350b0e3c9 (patch)
tree9573945b65a6be50ef6e726034e3e40b49cd8985 /actions
parentbb1548451ae39cda7a4c6212bee204a9d38e6ba7 (diff)
parentbd9824c8d563bbd2d9f9ed259341f0e2fc1ffdf1 (diff)
Merge commit 'br3nda/0.8.x-noticesfix' into 0.8.x
Diffstat (limited to 'actions')
-rw-r--r--actions/favorited.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/actions/favorited.php b/actions/favorited.php
index c902d80f5..156c7a700 100644
--- a/actions/favorited.php
+++ b/actions/favorited.php
@@ -194,7 +194,7 @@ class FavoritedAction extends Action
$qry = 'SELECT notice.*, '.
$weightexpr . ' as weight ' .
'FROM notice JOIN fave ON notice.id = fave.notice_id ' .
- 'GROUP BY id,profile_id,uri,content,rendered,url,created,notice.modified,reply_to,is_local,source ' .
+ 'GROUP BY id,profile_id,uri,content,rendered,url,created,notice.modified,reply_to,is_local,source,notice.conversation ' .
'ORDER BY weight DESC';
$offset = ($this->page - 1) * NOTICES_PER_PAGE;