From d36f8bdb45c6586807aa37b4ac32acf6de973269 Mon Sep 17 00:00:00 2001
From: Karl 'vollmerk' Vollmer <vollmer@ampache.org>
Date: Wed, 25 Jan 2006 03:40:06 +0000
Subject: fixed tooltip truncate where it shouldnt have been

---
 docs/CHANGELOG            | 1 +
 lib/class/album.class.php | 6 +++---
 modules/init.php          | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/docs/CHANGELOG b/docs/CHANGELOG
index 8b98147f..fd691d73 100755
--- a/docs/CHANGELOG
+++ b/docs/CHANGELOG
@@ -4,6 +4,7 @@
 
 --------------------------------------------------------------------------
   v.3.3.2-Beta2 
+  	- Fixed truncated names on tool-tip text (Thx Patrik)
   	- Fixed a few more Search snafu's that caused it to not remember
 		what you had selected after performing a search (Thx Rubin)
   	- Fixed ordering of playlist m3u generation
diff --git a/lib/class/album.class.php b/lib/class/album.class.php
index f6bb6c43..c1deb274 100644
--- a/lib/class/album.class.php
+++ b/lib/class/album.class.php
@@ -140,9 +140,9 @@ class Album {
 	        $web_path = conf('web_path');
 
 		/* Truncate the string if it's to long */
-		$name 		= htmlspecialchars(truncate_with_ellipse($this->name,conf('ellipse_threshold_album')));
-		$artist		= htmlspecialchars($this->artist);
-	        $this->f_name	= "<a href=\"$web_path/albums.php?action=show&amp;album=" . $this->id . "\" title=\"" . $name . "\">" . $name . "</a>";
+		$name 		= scrub_out(truncate_with_ellipse($this->name,conf('ellipse_threshold_album')));
+		$artist		= scrub_out($this->artist);
+	        $this->f_name	= "<a href=\"$web_path/albums.php?action=show&amp;album=" . $this->id . "\" title=\"" . scrub_out($this->name) . "\">" . $name . "</a>";
 	        $this->f_songs	= "<div align=\"center\">" . $this->songs . "</div>";
 		if ($this->artist_count == '1') { 
 		        $this->f_artist	= "<a href=\"$web_path/artists.php?action=show&amp;artist=" . $this->artist_id . "\">" . $artist . "</a>";
diff --git a/modules/init.php b/modules/init.php
index 6d36ff01..71192f6a 100644
--- a/modules/init.php
+++ b/modules/init.php
@@ -80,7 +80,7 @@ if (!$results['allow_stream_playback']) {
 
 $results['raw_web_path']	= $results['web_path'];
 $results['web_path']		= $http_type . $_SERVER['HTTP_HOST'] . $results['web_path'];
-$results['version']		= '3.3.2-Beta2 (Build 003)';
+$results['version']		= '3.3.2-Beta2 (Build 004)';
 $results['catalog_file_pattern']= 'mp3|mpc|m4p|m4a|mp4|aac|ogg|rm|wma|asf|flac|spx|ra';
 $results['http_port']		= $_SERVER['SERVER_PORT'];
 if (!$results['prefix']) { 
-- 
cgit