new flash player that still does not work, fixed some bad references to the ellipsis thresholds

4 files changed, 8 insertions, 8 deletions

diff --git a/lib/class/album.class.php b/lib/class/album.class.php
index 1fae7fd0..713b8a0a 100644
--- a/lib/class/album.class.php
+++ b/lib/class/album.class.php
@@ -209,7 +209,7 @@ class Album {
 		foreach ($data as $key=>$value) { $this->$key = $value; } 
 		
 		/* Truncate the string if it's to long */
-	  	$this->f_name		= truncate_with_ellipsis($this->full_name,Config::get('ellipsis_threshold_album'));
+	  	$this->f_name		= truncate_with_ellipsis($this->full_name,Config::get('ellipse_threshold_album'));
 
 		$this->f_name_link	= "<a href=\"$web_path/albums.php?action=show&amp;album=" . scrub_out($this->id) . "\" title=\"" . scrub_out($this->full_name) . "\">" . $this->f_name;
 		// If we've got a disk append it
@@ -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_artist')));
+			$artist = scrub_out(truncate_with_ellipsis(trim($this->artist_prefix . ' ' . $this->artist_name),Config::get('ellipse_threshold_artist')));
 		        $this->f_artist_link = "<a href=\"$web_path/artists.php?action=show&amp;artist=" . $this->artist_id . "\" title=\"" . scrub_out($this->artist_name) . "\">" . $artist . "</a>";
 			$this->f_artist = $artist; 
 		}
diff --git a/lib/class/artist.class.php b/lib/class/artist.class.php
index 057ec549..38361194 100644
--- a/lib/class/artist.class.php
+++ b/lib/class/artist.class.php
@@ -223,7 +223,7 @@ class Artist {
 	public function format() {
 
 		/* Combine prefix and name, trim then add ... if needed */
-                $name = truncate_with_ellipsis(trim($this->prefix . " " . $this->name),Config::get('ellipsis_threshold_artist'));
+                $name = truncate_with_ellipsis(trim($this->prefix . " " . $this->name),Config::get('ellipse_threshold_artist'));
 		$this->f_name = $name;
 		$this->f_full_name = trim($this->prefix . " " . $this->name); 
 
diff --git a/lib/class/update.class.php b/lib/class/update.class.php
index 291c26e8..6efb2de6 100644
--- a/lib/class/update.class.php
+++ b/lib/class/update.class.php
@@ -1,7 +1,7 @@
 <?php
 /*
 
- Copyright (c) 2001 - 2007 Ampache.org
+ Copyright (c) Ampache.org
  All rights reserved.
 
  This program is free software; you can redistribute it and/or
diff --git a/lib/general.lib.php b/lib/general.lib.php
index e9cf0e3b..382f5716 100644
--- a/lib/general.lib.php
+++ b/lib/general.lib.php
@@ -232,7 +232,7 @@ function get_global_popular($type) {
                         $text = "$song->f_artist_full - $song->title";
                         /* Add to array */
                         $song->link = "<a href=\"$web_path/stream.php?action=single_song&amp;song_id=$song->id\" title=\"". scrub_out($text) ."\">" .
-	                           	scrub_out(truncate_with_ellipsis($text, Config::get('ellipsis_threshold_title')+3)) . "&nbsp;(" . $r['count'] . ")</a>";
+	                           	scrub_out(truncate_with_ellipsis($text, Config::get('ellipse_threshold_title')+3)) . "&nbsp;(" . $r['count'] . ")</a>";
 			$items[] = $song;
                 } // if it's a song
                 
@@ -241,7 +241,7 @@ function get_global_popular($type) {
                         $artist = new Artist($r['object_id']);
 			$artist->format();
                         $artist->link = "<a href=\"$web_path/artists.php?action=show&amp;artist=" . $r['object_id'] . "\" title=\"". scrub_out($artist->full_name) ."\">" .
-                        	           truncate_with_ellipsis($artist->full_name, Config::get('ellipsis_threshold_artist')+3) . "&nbsp;(" . $r['count'] . ")</a>";
+                        	           truncate_with_ellipsis($artist->full_name, Config::get('ellipse_threshold_artist')+3) . "&nbsp;(" . $r['count'] . ")</a>";
 			$items[] = $artist;
                 } // if type isn't artist
 
@@ -250,7 +250,7 @@ function get_global_popular($type) {
                         $album   = new Album($r['object_id']);
 			$album->format(); 
                         $album->link = "<a href=\"$web_path/albums.php?action=show&amp;album=" . $r['object_id'] . "\" title=\"". scrub_out($album->name) ."\">" . 
-                        	           scrub_out(truncate_with_ellipsis($album->name,Config::get('ellipsis_threshold_album')+3)) . "&nbsp;(" . $r['count'] . ")</a>";
+                        	           scrub_out(truncate_with_ellipsis($album->name,Config::get('ellipse_threshold_album')+3)) . "&nbsp;(" . $r['count'] . ")</a>";
 			$items[] = $album;
                 } // else not album
 
@@ -258,7 +258,7 @@ function get_global_popular($type) {
 			$genre 	 = new Genre($r['object_id']);
 			$genre->format(); 
 			$genre->link = "<a href=\"$web_path/browse.php?action=genre&amp;genre=" . $r['object_id'] . "\" title=\"" . scrub_out($genre->name) . "\">" .
-					scrub_out(truncate_with_ellipsis($genre->name,Config::get('ellipsis_threshold_title')+3)) . "&nbsp;(" . $r['count'] . ")</a>";
+					scrub_out(truncate_with_ellipsis($genre->name,Config::get('ellipse_threshold_title')+3)) . "&nbsp;(" . $r['count'] . ")</a>";
 			$items[] = $genre;
 		} // end if genre
         } // end foreach