diff options
| author | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2007-02-12 16:17:15 +0000 |
|---|---|---|
| committer | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2007-02-12 16:17:15 +0000 |
| commit | 796e90d890c5e01d5e410258c513c4917c09fb0f (patch) | |
| tree | f75ed0410493f2a0e861ce2550e478e28dbf6692 /lib/class/tmp_playlist.class.php | |
| parent | d148c82cd2853fd954f63b7f23e0aa9bb98ff175 (diff) | |
| download | ampache-796e90d890c5e01d5e410258c513c4917c09fb0f.tar.gz ampache-796e90d890c5e01d5e410258c513c4917c09fb0f.tar.bz2 ampache-796e90d890c5e01d5e410258c513c4917c09fb0f.zip | |
flip democratic play sorting to FIFO
Diffstat (limited to 'lib/class/tmp_playlist.class.php')
| -rw-r--r-- | lib/class/tmp_playlist.class.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/class/tmp_playlist.class.php b/lib/class/tmp_playlist.class.php index a0356f13..cc5f1b39 100644 --- a/lib/class/tmp_playlist.class.php +++ b/lib/class/tmp_playlist.class.php @@ -86,7 +86,7 @@ class tmpPlaylist { $order = 'ORDER BY id ASC'; if ($this->type == 'vote') { - $order = "GROUP BY tmp_playlist_data.id ORDER BY `count` ,user_vote.date DESC"; + $order = "GROUP BY tmp_playlist_data.id ORDER BY `count` DESC, user_vote.date ASC"; $vote_select = ", COUNT(user_vote.user) AS `count`"; $vote_join = "LEFT JOIN user_vote ON user_vote.object_id=tmp_playlist_data.id"; } @@ -123,7 +123,7 @@ class tmpPlaylist { if ($this->type == 'vote') { /* Add conditions for voting */ $vote_select = ", COUNT(user_vote.user) AS `count`"; - $order = " GROUP BY tmp_playlist_data.id ORDER BY `count`, user_vote.date DESC"; + $order = " GROUP BY tmp_playlist_data.id ORDER BY `count` DESC, user_vote.date ASC"; $vote_join = "LEFT JOIN user_vote ON user_vote.object_id=tmp_playlist_data.id"; } |