summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lib/class/artist.class.php2
-rw-r--r--lib/class/browse.class.php2
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`";