diff options
| author | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2008-05-27 13:29:33 +0000 |
|---|---|---|
| committer | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2008-05-27 13:29:33 +0000 |
| commit | 384e42bf81635832cc5a033b84e8350b6409b444 (patch) | |
| tree | 602d3d9e2a1c5896f0af9d77ed9da11276c417b9 | |
| parent | 99496ce46b725515701696fe8150754cabf1ac40 (diff) | |
| download | ampache-384e42bf81635832cc5a033b84e8350b6409b444.tar.gz ampache-384e42bf81635832cc5a033b84e8350b6409b444.tar.bz2 ampache-384e42bf81635832cc5a033b84e8350b6409b444.zip | |
fix the show artists page, broken when I removed the box
| -rw-r--r-- | artists.php | 15 | ||||
| -rw-r--r-- | templates/show_artist.inc.php | 4 |
2 files changed, 7 insertions, 12 deletions
diff --git a/artists.php b/artists.php index a3bc3404..768b698d 100644 --- a/artists.php +++ b/artists.php @@ -30,21 +30,16 @@ switch($_REQUEST['action']) { case 'show': $artist = new Artist($_REQUEST['artist']); $artist->format(); - $albums = $artist->get_albums(); + $object_ids = $artist->get_albums(); + $object_type = 'album'; require_once Config::get('prefix') . '/templates/show_artist.inc.php'; break; case 'show_all_songs': $artist = new Artist($_REQUEST['artist']); $artist->format(); - require_once Config::get('prefix') . '/templates/show_artist_box.inc.php'; - //$song_ids = $artist->get_songs(); - Browse::set_type('song'); - Browse::reset_filters(); - //Browse::set_filter('artist', $artist->id); - Browse::set_filter_from_request($_REQUEST); - //Browse::set_static_content(1); - Browse::get_objects(); - Browse::show_objects(); + $object_type = 'song'; + $object_ids = $artist->get_songs(); + require_once Config::get('prefix') . '/templates/show_artist.inc.php'; break; case 'update_from_tags': diff --git a/templates/show_artist.inc.php b/templates/show_artist.inc.php index a2df6045..4b949b21 100644 --- a/templates/show_artist.inc.php +++ b/templates/show_artist.inc.php @@ -59,8 +59,8 @@ if (Config::get('ratings')) { <?php show_box_bottom(); ?> <?php Browse::reset_filters(); - Browse::set_type('album'); + Browse::set_type($object_type); Browse::set_static_content(1); - Browse::save_objects($albums); + Browse::save_objects($object_ids); Browse::show_objects(); ?> |