removed some old/legacy functions fixed download and merged it into the /play

3 files changed, 6 insertions, 6 deletions

diff --git a/lib/class/album.class.php b/lib/class/album.class.php
index f03a1990..fc54f390 100644
--- a/lib/class/album.class.php
+++ b/lib/class/album.class.php
@@ -184,11 +184,11 @@ class Album {
 		foreach ($data as $key=>$value) { $this->$key = $value; } 
 		
 		/* Truncate the string if it's to long */
-	        $this->f_name	= scrub_out(truncate_with_ellipse($this->name,Config::get('ellipse_threshold_album')));
+	        $this->f_name	= scrub_out(truncate_with_ellipsis($this->name,Config::get('ellipsis_threshold_album')));
 		$this->f_name_link	= "<a href=\"$web_path/albums.php?action=show&amp;album=" . scrub_out($this->id) . "\" title=\"" . scrub_out($this->name) . "\">" . $this->f_name . "</a>";
 		$this->f_title	= $name; 
 		if ($this->artist_count == '1') { 
-			$artist = scrub_out(truncate_with_ellipse(trim($this->artist_prefix . ' ' . $this->artist_name),Config::get('ellipse_threshold_album')));
+			$artist = scrub_out(truncate_with_ellipsis(trim($this->artist_prefix . ' ' . $this->artist_name),Config::get('ellipsis_threshold_album')));
 		        $this->f_artist	= "<a href=\"$web_path/artists.php?action=show&amp;artist=" . $this->artist_id . "\">" . $artist . "</a>";
 		}
 		else {
diff --git a/lib/class/artist.class.php b/lib/class/artist.class.php
index eb18b539..3de53153 100644
--- a/lib/class/artist.class.php
+++ b/lib/class/artist.class.php
@@ -183,7 +183,7 @@ class Artist {
 	public function format() {
 
 		/* Combine prefix and name, trim then add ... if needed */
-                $name = truncate_with_ellipse(trim($this->prefix . " " . $this->name));
+                $name = truncate_with_ellipsis(trim($this->prefix . " " . $this->name));
 		$this->f_name = $name;
 
 		//FIXME: This shouldn't be scrubing right here!!!!
diff --git a/lib/class/song.class.php b/lib/class/song.class.php
index 4200ff2a..1dd7aa20 100644
--- a/lib/class/song.class.php
+++ b/lib/class/song.class.php
@@ -629,14 +629,14 @@ class Song {
 		    
 		// Format the album name
 		$this->f_album_full = $this->get_album_name();
-		$this->f_album = truncate_with_ellipse($this->f_album_full,Config::get('ellipse_threshold_album'));
+		$this->f_album = truncate_with_ellipsis($this->f_album_full,Config::get('ellipse_threshold_album'));
 
 		// Format the artist name
 		$this->f_artist_full = $this->get_artist_name();
-		$this->f_artist = truncate_with_ellipse($this->f_artist_full,Config::get('ellipse_threshold_artist'));
+		$this->f_artist = truncate_with_ellipsis($this->f_artist_full,Config::get('ellipse_threshold_artist'));
 
 		// Format the title
-		$this->f_title = truncate_with_ellipse($this->title,Config::get('ellipse_threshold_title'));
+		$this->f_title = truncate_with_ellipsis($this->title,Config::get('ellipse_threshold_title'));
 
 		// Create Links for the different objects 
 		$this->f_link = "<a href=\"" . Config::get('web_path') . "/stream.php?action=single_song&amp;song_id=" . $this->id . "\">$this->f_title</a>";