summaryrefslogtreecommitdiffstats
path: root/lib/general.lib.php
diff options
context:
space:
mode:
authorKarl 'vollmerk' Vollmer <vollmer@ampache.org>2008-04-11 02:35:32 +0000
committerKarl 'vollmerk' Vollmer <vollmer@ampache.org>2008-04-11 02:35:32 +0000
commit0b733c05eed503ba8c00443a77ec45664b81ce28 (patch)
treeaf833a908d8b286e7808bbe4257e3742cee963aa /lib/general.lib.php
parente1813f532f7ab0ad82b829ba4034181236e0f5ba (diff)
downloadampache-0b733c05eed503ba8c00443a77ec45664b81ce28.tar.gz
ampache-0b733c05eed503ba8c00443a77ec45664b81ce28.tar.bz2
ampache-0b733c05eed503ba8c00443a77ec45664b81ce28.zip
new flash player that still does not work, fixed some bad references to the ellipsis thresholds
Diffstat (limited to 'lib/general.lib.php')
-rw-r--r--lib/general.lib.php8
1 files changed, 4 insertions, 4 deletions
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