Merge remote-tracking branch 'origin/master' into develop

2018-11-05 13:25:42 -05:00 · 2018-11-05 13:25:42 -05:00 · 7f6b0178a8
commit 7f6b0178a8
parent 033ea46754 8b938add27
1 changed files with 1 additions and 1 deletions
--- a/src/Model/AnimeCollection.php
+++ b/src/Model/AnimeCollection.php
@ -121,7 +121,7 @@ final class AnimeCollection extends Collection {
 			->join('media', 'media.id=a.media_id', 'inner')
 			->order_by('media')
 			->order_by('title')
-			->group_by('a.hummingbird_id')
+			->group_by('a.hummingbird_id, media.type')
 			->get();

 		// Add genres associated with each item