diff options
| author | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2007-09-28 20:40:07 +0000 |
|---|---|---|
| committer | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2007-09-28 20:40:07 +0000 |
| commit | f4ab9bad1a8bee3b8ed43edceb02d526ede0a7fc (patch) | |
| tree | 79ee6a780b2dc46de5194bc87a219c3f55815cde | |
| parent | 13852c51ea25a25e3629c7df79894ea51c91f3dd (diff) | |
| download | ampache-f4ab9bad1a8bee3b8ed43edceb02d526ede0a7fc.tar.gz ampache-f4ab9bad1a8bee3b8ed43edceb02d526ede0a7fc.tar.bz2 ampache-f4ab9bad1a8bee3b8ed43edceb02d526ede0a7fc.zip | |
fixed rss feeds (Thx Purdyk) and tweaked the truncate_with_ellipse
| -rw-r--r-- | lib/rss.php | 4 | ||||
| -rw-r--r-- | lib/ui.lib.php | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/lib/rss.php b/lib/rss.php index e5111ad3..4f0b1b9c 100644 --- a/lib/rss.php +++ b/lib/rss.php @@ -199,7 +199,7 @@ switch ($type) { echo "<item>\n"; $song = new Song($item['object_id']); - $song->format_song(); + $song->format(); $user = new User($item['user']); $user->format_user(); echo " <title><![CDATA[$song->title]]></title>\n"; @@ -225,7 +225,7 @@ switch ($type) { $song = $r['song']; $user = $r['user']; - $song->format_song(); + $song->format(); $artist = $song->f_artist; $album = $song->get_album_name(); $text = "$artist - $song->f_title played by $user->fullname"; diff --git a/lib/ui.lib.php b/lib/ui.lib.php index 859f90f3..efdaa736 100644 --- a/lib/ui.lib.php +++ b/lib/ui.lib.php @@ -176,8 +176,10 @@ function show_local_control () { * @catagory General * @author Nedko Arnaudov */ -function truncate_with_ellipsis($text, $max=27) { +function truncate_with_ellipsis($text, $max='') { + $max = $max ? $max : '27'; + /* If we want it to be shorter than three, just throw it back */ if ($max > 3) { |