diff options
| -rw-r--r-- | lib/class/artist.class.php | 5 | ||||
| -rw-r--r-- | templates/show_artists.inc.php | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/lib/class/artist.class.php b/lib/class/artist.class.php index c89eb271..6348339e 100644 --- a/lib/class/artist.class.php +++ b/lib/class/artist.class.php @@ -186,15 +186,14 @@ class Artist { function format() { /* Combine prefix and name, trim then add ... if needed */ - $name = scrub_out(truncate_with_ellipse(trim($this->prefix . " " . $this->name))); - $this->f_name = $this->name; + $name = truncate_with_ellipse(trim($this->prefix . " " . $this->name)); + $this->f_name = $name; //FIXME: This shouldn't be scrubing right here!!!! $this->full_name = scrub_out(trim($this->prefix . " " . $this->name)); //FIXME: This should be f_link $this->link = "<a href=\"" . conf('web_path') . "/artists.php?action=show&artist=" . $this->id . "\" title=\"" . $this->full_name . "\">" . $name . "</a>"; - $this->name = $this->link; // Get the counts $this->get_count(); diff --git a/templates/show_artists.inc.php b/templates/show_artists.inc.php index 7b1176b6..4f52e257 100644 --- a/templates/show_artists.inc.php +++ b/templates/show_artists.inc.php @@ -43,7 +43,7 @@ $total_items = $view->total_items; //FIXME: These should come in as objects... foreach ($artists as $artist) { ?> <tr class="<?php echo flip_class(); ?>"> - <td><?php echo $artist->f_name; ?></td> + <td><?php echo $artist->link; ?></td> <td><?php echo $artist->songs; ?></td> <td><?php echo $artist->albums; ?></td> <td nowrap="nowrap"> |