summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin James 'purdyk' Purdy <purdyk@gmail.com>2008-02-15 22:28:14 +0000
committerKevin James 'purdyk' Purdy <purdyk@gmail.com>2008-02-15 22:28:14 +0000
commit4314b635f170c3ea41b1791e6fe1135fa6a67466 (patch)
tree83fd29ea3b9522fc6a28451340003d021beb319f
parent2ac17f6c51b500fe62fc8e44cd347ddeb1c406a8 (diff)
downloadampache-4314b635f170c3ea41b1791e6fe1135fa6a67466.tar.gz
ampache-4314b635f170c3ea41b1791e6fe1135fa6a67466.tar.bz2
ampache-4314b635f170c3ea41b1791e6fe1135fa6a67466.zip
Fixed rss feeds to show proper length of song and artist names.
-rw-r--r--lib/rss.php8
-rw-r--r--templates/show_now_playing_row.inc.php6
2 files changed, 7 insertions, 7 deletions
diff --git a/lib/rss.php b/lib/rss.php
index 4f0b1b9c..7f583380 100644
--- a/lib/rss.php
+++ b/lib/rss.php
@@ -226,14 +226,14 @@ switch ($type) {
$song = $r['song'];
$user = $r['user'];
$song->format();
- $artist = $song->f_artist;
- $album = $song->get_album_name();
- $text = "$artist - $song->f_title played by $user->fullname";
+ $artist = $song->f_artist_full;
+ $album = $song->f_album_full;
+ $text = "$artist - $song->title played by $user->fullname";
echo "<item> \n";
echo " <title><![CDATA[$text]]></title> \n";
echo " <image>$web_path/image.php?id=$song->album</image>\n";
echo " <link>$web_path/albums.php?action=show&amp;album=$song->album</link>\n";
- echo " <description><![CDATA[$song->f_title @ $album is played by $user->fullname]]></description>\n";
+ echo " <description><![CDATA[$song->title @ $album is played by $user->fullname]]></description>\n";
echo " <pubDate>$today</pubDate>\n";
echo "</item>\n";
}
diff --git a/templates/show_now_playing_row.inc.php b/templates/show_now_playing_row.inc.php
index 4c80e462..afb5c3b7 100644
--- a/templates/show_now_playing_row.inc.php
+++ b/templates/show_now_playing_row.inc.php
@@ -20,9 +20,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
/* Prepare the variables */
-$title = scrub_out(truncate_with_ellipsis($song->title,'25'));
-$album = scrub_out(truncate_with_ellipsis($song->f_album_full,'25'));
-$artist = scrub_out(truncate_with_ellipsis($song->f_artist_full,'25'));
+$title = scrub_out(truncate_with_ellipsis($song->title));
+$album = scrub_out(truncate_with_ellipsis($song->f_album_full));
+$artist = scrub_out(truncate_with_ellipsis($song->f_artist_full));
?>
<div class="np_group">
<div class="np_cell cel_username">