diff options
author | Evan Prodromou <evan@controlyourself.ca> | 2009-03-12 11:56:23 -0400 |
---|---|---|
committer | Evan Prodromou <evan@controlyourself.ca> | 2009-03-12 11:56:23 -0400 |
commit | b3a0eea3b66e95becb6c4595ed71c7fe71ed6437 (patch) | |
tree | 76666150701f03205bfff77e7d034dfa724f8764 /actions/favorited.php | |
parent | 399669b1fb955d2d8c18098a7b551184d534a94c (diff) | |
parent | e185c0395a6cd250ccd7c8e385c54830be73f937 (diff) |
Merge branch '0.7.x' into 0.8.x
Conflicts:
classes/Notice.php
lib/action.php
lib/router.php
lib/twitter.php
Diffstat (limited to 'actions/favorited.php')
-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 5082f4a4e..231b97897 100644 --- a/actions/favorited.php +++ b/actions/favorited.php @@ -178,7 +178,7 @@ class FavoritedAction extends Action $qry = 'SELECT notice.*, '. $weightexpr . ' as weight ' . 'FROM notice JOIN fave ON notice.id = fave.notice_id ' . - 'GROUP BY fave.notice_id ' . + 'GROUP BY id,profile_id,uri,content,rendered,url,created,notice.modified,reply_to,is_local,source ' . 'ORDER BY weight DESC'; $offset = ($this->page - 1) * NOTICES_PER_PAGE; |