summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xdocs/CHANGELOG1
-rw-r--r--lib/class/playlist.class.php2
-rw-r--r--song.php1
3 files changed, 3 insertions, 1 deletions
diff --git a/docs/CHANGELOG b/docs/CHANGELOG
index c14df3be..8f3950fe 100755
--- a/docs/CHANGELOG
+++ b/docs/CHANGELOG
@@ -4,6 +4,7 @@
--------------------------------------------------------------------------
v.3.3.2-Beta2
+ - Fixed ordering of playlist m3u generation
- Fixed ratings images to use Javascript hotness (Thx burnsides)
- Fixed a catalog update bug that was introduced when I switched
over to vauth.
diff --git a/lib/class/playlist.class.php b/lib/class/playlist.class.php
index 51399b41..49dfdbf9 100644
--- a/lib/class/playlist.class.php
+++ b/lib/class/playlist.class.php
@@ -120,7 +120,7 @@ class Playlist {
foreach ($array as $data) {
- $sql = "SELECT song,dyn_song FROM playlist_data WHERE id='" . sql_escape($data) . "'";
+ $sql = "SELECT song,dyn_song FROM playlist_data WHERE id='" . sql_escape($data) . "' ORDER BY track";
$db_results = mysql_query($sql, dbh());
$r = mysql_fetch_assoc($db_results);
diff --git a/song.php b/song.php
index 8e1afcc4..e8989779 100644
--- a/song.php
+++ b/song.php
@@ -72,6 +72,7 @@ switch ($action) {
$playlist = new Playlist($_REQUEST['playlist_id']);
$song_ids = $playlist->get_songs($_REQUEST['song']);
$_REQUEST['action'] = 'm3u';
+ break;
case 'playlist_random':
$playlist = new Playlist($_REQUEST['playlist_id']);
$song_ids = $playlist->get_random_songs();