diff options
| author | spocky <spocky@ampache> | 2008-01-15 14:24:05 +0000 |
|---|---|---|
| committer | spocky <spocky@ampache> | 2008-01-15 14:24:05 +0000 |
| commit | 547332df9d4b3b153888577fd0c36d3996dd8ea9 (patch) | |
| tree | 2652bd1d64a8f10b9d19fdff3eb99222a54659f4 | |
| parent | 675367cb4149e2806d1448a988b5adee74bc3b94 (diff) | |
| download | ampache-547332df9d4b3b153888577fd0c36d3996dd8ea9.tar.gz ampache-547332df9d4b3b153888577fd0c36d3996dd8ea9.tar.bz2 ampache-547332df9d4b3b153888577fd0c36d3996dd8ea9.zip | |
Fixed album sorting not using disk# (this time, it shouldn't break anything)
| -rw-r--r-- | lib/class/artist.class.php | 2 | ||||
| -rw-r--r-- | lib/class/browse.class.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/class/artist.class.php b/lib/class/artist.class.php index 1409518b..70af97e2 100644 --- a/lib/class/artist.class.php +++ b/lib/class/artist.class.php @@ -121,7 +121,7 @@ class Artist { $results = array(); $sql = "SELECT `album`.`id` FROM album LEFT JOIN `song` ON `song`.`album`=`album`.`id` " . - "WHERE `song`.`artist`='$this->id' GROUP BY `album`.`id` ORDER BY `album`.`name`,`album`.`year`"; + "WHERE `song`.`artist`='$this->id' GROUP BY `album`.`id` ORDER BY `album`.`name`,`album`.`disk`,`album`.`year`"; $db_results = Dba::query($sql); while ($r = Dba::fetch_assoc($db_results)) { diff --git a/lib/class/browse.class.php b/lib/class/browse.class.php index df3cd68e..c9f43676 100644 --- a/lib/class/browse.class.php +++ b/lib/class/browse.class.php @@ -573,7 +573,7 @@ class Browse { case 'album': switch($field) { case 'name': - $sql = "`album`.`name`"; + $sql = "`album`.`name` $order, `album`.`disk`"; break; case 'year': $sql = "`album`.`year`"; |