diff options
| author | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2006-10-29 19:16:56 +0000 |
|---|---|---|
| committer | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2006-10-29 19:16:56 +0000 |
| commit | c63317e869d1da28ab3a429bf4116446f9bcbc64 (patch) | |
| tree | 6b717f2dae35ddd22bcd7755c3c0f9d453a3acd0 /lib/general.lib.php | |
| parent | 98c4a922621fd2df37a1204c09b06594f20536ea (diff) | |
| download | ampache-c63317e869d1da28ab3a429bf4116446f9bcbc64.tar.gz ampache-c63317e869d1da28ab3a429bf4116446f9bcbc64.tar.bz2 ampache-c63317e869d1da28ab3a429bf4116446f9bcbc64.zip | |
some initial flash player integration from forums and some bug fixes on most popular
Diffstat (limited to 'lib/general.lib.php')
| -rw-r--r-- | lib/general.lib.php | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/lib/general.lib.php b/lib/general.lib.php index d9823a40..fc60db3e 100644 --- a/lib/general.lib.php +++ b/lib/general.lib.php @@ -627,21 +627,23 @@ function get_global_popular($type) { /* If Artist */ elseif ( $type == 'artist' ) { - $artist = get_artist_name($r['object_id']); - $items[] = "<li> <a href=\"$web_path/artists.php?action=show&artist=$r->object_id\" title=\"". scrub_out($artist) ."\">" . + $artist_obj = new Artist($r['object_id']); + $artist_obj->format_artist(); + $artist = $artist_obj->full_name; + $items[] = "<li> <a href=\"$web_path/artists.php?action=show&artist=" . $r['object_id'] . "\" title=\"". scrub_out($artist) ."\">" . scrub_out(truncate_with_ellipse($artist, conf('ellipse_threshold_artist')+3)) . " (" . $r['count'] . ")</a> </li>"; } // if type isn't artist /* If Album */ elseif ( $type == 'album' ) { $album = new Album($r['object_id']); - $items[] = "<li> <a href=\"$web_path/albums.php?action=show&album=$r->object_id\" title=\"". scrub_out($album->name) ."\">" . + $items[] = "<li> <a href=\"$web_path/albums.php?action=show&album=" . $r['object_id'] . "\" title=\"". scrub_out($album->name) ."\">" . scrub_out(truncate_with_ellipse($album->name,conf('ellipse_threshold_album')+3)) . " (" . $r['count'] . ")</a> </li>"; } // else not album elseif ($type == 'genre') { $genre = new Genre($r['object_id']); - $items[] = "<li> <a href=\"$web_path/browse.php?action=genre&genre=$r->object_id\" title=\"" . scrub_out($genre->name) . "\">" . + $items[] = "<li> <a href=\"$web_path/browse.php?action=genre&genre=" . $r['object_id'] . "\" title=\"" . scrub_out($genre->name) . "\">" . scrub_out(truncate_with_ellipse($genre->name,conf('ellipse_threshold_title')+3)) . " (" . $r['count'] . ")</a> </li>"; } // end if genre } // end foreach |