summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorspocky <spocky@ampache>2008-01-17 09:37:36 +0000
committerspocky <spocky@ampache>2008-01-17 09:37:36 +0000
commit86263d7c1be8aa4f083f47e5f1bcee9ab01f64c8 (patch)
tree9ca94a60ba022d94b77e4ebf39c4bc995245a568
parent153fcb98d4a7545df9ef34690cbf46bb557064f0 (diff)
downloadampache-86263d7c1be8aa4f083f47e5f1bcee9ab01f64c8.tar.gz
ampache-86263d7c1be8aa4f083f47e5f1bcee9ab01f64c8.tar.bz2
ampache-86263d7c1be8aa4f083f47e5f1bcee9ab01f64c8.zip
Fixed artist display wrongly using ellipsis_threshold_album preference
Fixed wrong artist html encoding in random albums image title
-rw-r--r--lib/class/album.class.php2
-rw-r--r--templates/show_random_albums.inc.php2
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/class/album.class.php b/lib/class/album.class.php
index ea39c9aa..a4c9601b 100644
--- a/lib/class/album.class.php
+++ b/lib/class/album.class.php
@@ -221,7 +221,7 @@ class Album {
$this->f_link = $this->f_name_link;
$this->f_title = $full_name;
if ($this->artist_count == '1') {
- $artist = scrub_out(truncate_with_ellipsis(trim($this->artist_prefix . ' ' . $this->artist_name),Config::get('ellipsis_threshold_album')));
+ $artist = scrub_out(truncate_with_ellipsis(trim($this->artist_prefix . ' ' . $this->artist_name),Config::get('ellipsis_threshold_artist')));
$this->f_artist_link = "<a href=\"$web_path/artists.php?action=show&amp;artist=" . $this->artist_id . "\">" . $artist . "</a>";
$this->f_artist = $artist;
}
diff --git a/templates/show_random_albums.inc.php b/templates/show_random_albums.inc.php
index 1c947fb7..8a879f9e 100644
--- a/templates/show_random_albums.inc.php
+++ b/templates/show_random_albums.inc.php
@@ -26,7 +26,7 @@ $web_path = Config::get('web_path');
foreach ($albums as $album_id) {
$album = new Album($album_id);
$album->format();
- $name = scrub_out('[' . $album->f_artist . '] ' . $album->full_name);
+ $name = '[' . $album->f_artist . '] ' . scrub_out($album->full_name);
?>
<div class="random_album">
<a href="<?php echo $web_path; ?>/albums.php?action=show&amp;album=<?php echo $album_id; ?>">