diff options
| author | Zach Copley <zach@controlyourself.ca> | 2009-07-07 20:15:05 +0000 |
|---|---|---|
| committer | Zach Copley <zach@controlyourself.ca> | 2009-07-07 20:15:05 +0000 |
| commit | 673cdab874422634a3be8afc009fbd983c73e572 (patch) | |
| tree | 9511e55f65232e7e931d0ba02cef1b4a4310ac7b /actions | |
| parent | 8bc924224b96928e9d41a18a83f515e5e53ba4f7 (diff) | |
| parent | d846c5fc9927b93e59192e19fd59a8d350b0e3c9 (diff) | |
Merge branch '0.8.x' of git@gitorious.org:laconica/dev into 0.8.x
Diffstat (limited to 'actions')
| -rw-r--r-- | actions/favorited.php | 2 |
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; |