summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKarl 'vollmerk' Vollmer <vollmer@ampache.org>2006-01-25 03:40:06 +0000
committerKarl 'vollmerk' Vollmer <vollmer@ampache.org>2006-01-25 03:40:06 +0000
commitd36f8bdb45c6586807aa37b4ac32acf6de973269 (patch)
tree83403f766cdbb4ecda428ce96840d88b15b17ff6
parent1607672a4a376fdcb1fd29a4806bb21a771ab013 (diff)
downloadampache-d36f8bdb45c6586807aa37b4ac32acf6de973269.tar.gz
ampache-d36f8bdb45c6586807aa37b4ac32acf6de973269.tar.bz2
ampache-d36f8bdb45c6586807aa37b4ac32acf6de973269.zip
fixed tooltip truncate where it shouldnt have been
-rwxr-xr-xdocs/CHANGELOG1
-rw-r--r--lib/class/album.class.php6
-rw-r--r--modules/init.php2
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']) {