diff options
| author | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2006-11-05 23:38:15 +0000 |
|---|---|---|
| committer | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2006-11-05 23:38:15 +0000 |
| commit | 81ad69915a9cc20e5527b251a0e0245a4e53877a (patch) | |
| tree | b7ec4a02492347eae73b7f8f5b9cef5a48888dab | |
| parent | 66688aeea7d25723bbfa2b09f7135c61ad5894b2 (diff) | |
| download | ampache-81ad69915a9cc20e5527b251a0e0245a4e53877a.tar.gz ampache-81ad69915a9cc20e5527b251a0e0245a4e53877a.tar.bz2 ampache-81ad69915a9cc20e5527b251a0e0245a4e53877a.zip | |
fixed an issue with democratic play when the voted playlist ran out
| -rwxr-xr-x | docs/CHANGELOG | 1 | ||||
| -rw-r--r-- | lib/class/stream.class.php | 18 | ||||
| -rw-r--r-- | lib/class/tmp_playlist.class.php | 2 | ||||
| -rw-r--r-- | templates/show_album.inc | 2 |
4 files changed, 12 insertions, 11 deletions
diff --git a/docs/CHANGELOG b/docs/CHANGELOG index fcad5dd6..5f01b4b5 100755 --- a/docs/CHANGELOG +++ b/docs/CHANGELOG @@ -4,6 +4,7 @@ -------------------------------------------------------------------------- v.3.3.3-Alpha2 + - Fixed style issue on Single Album view when ratings are off - Added Democratic Play ability, UI incomplete and 'clunky' - Added some extra error checking to the install process - Fixed issue with delete confirmation on playlist always being diff --git a/lib/class/stream.class.php b/lib/class/stream.class.php index 6a5f595e..ca1eb0d7 100644 --- a/lib/class/stream.class.php +++ b/lib/class/stream.class.php @@ -187,7 +187,7 @@ class Stream { */ function create_xspf() { - $playlist = "<?xml version=\"1.0\" encoding=\"iso-8859-1\" ?> + $playlist = "<?xml version=\"1.0\" encoding=\"utf-8\" ?> <playlist version = \"1\" xmlns=\"http://xspf.org/ns/0/\"> <title>Ampache XSPF Playlist</title> <creator>" . conf('site_title') . "</creator> @@ -201,14 +201,14 @@ class Stream { $url = $song->get_url(); $song_name = $song->f_artist_full . " - " . $song->title . "." . $song->type; $playlist .= " <track>\n"; - $playlist .= " <location>$url</location>\n"; - $playlist .= " <identifier>$url</identifier>\n"; - $playlist .= " <title>" . $song->title . "</title>\n"; - $playlist .= " <creator>" . $song->f_artist_full . "</creator>\n"; + $playlist .= " <location><![CDATA[$url]]></location>\n"; + $playlist .= " <identifier><![CDATA[$url]]></identifier>\n"; + $playlist .= " <title><![CDATA[" . $song->title . "]]></title>\n"; + $playlist .= " <creator><![CDATA[" . $song->f_artist_full . "]]></creator>\n"; $playlist .= " <annotation></annotation>\n"; - $playlist .= " <info>" . conf('web_path') . "/albums.php?action=show&album=" . $song->album . "</info>\n"; - $playlist .= " <image>" . conf('web_path') . "/albumart.php?id=" . $song->album . "&thumb=2" . "</image>\n"; - $playlist .= " <album>" . $song->f_album_full . "</album>\n"; + $playlist .= " <info><![CDATA[" . conf('web_path') . "/albums.php?action=show&album=" . $song->album . "]]></info>\n"; + $playlist .= " <image><![CDATA[" . conf('web_path') . "/albumart.php?id=" . $song->album . "&thumb=2" . "]]></image>\n"; + $playlist .= " <album><![CDATA[" . $song->f_album_full . "]]></album>\n"; $playlist .= " <duration>" . $song->time . "</duration>\n"; $playlist .= " </track>\n\n\n"; } // end foreach @@ -216,7 +216,7 @@ class Stream { $playlist .= "</playlist>\n"; header("Cache-control: public"); header("Content-Disposition: filename=playlist.xspf"); - header("Content-Type: application/xspf+xml;"); + header("Content-Type: application/xspf+xml; charset=utf-8"); echo $playlist; } // create_xspf diff --git a/lib/class/tmp_playlist.class.php b/lib/class/tmp_playlist.class.php index e82036f3..127ea2d0 100644 --- a/lib/class/tmp_playlist.class.php +++ b/lib/class/tmp_playlist.class.php @@ -138,7 +138,7 @@ class tmpPlaylist { /* We need to pull a random one from the base_playlist */ $base_playlist = new playlist($this->base_playlist); $data = $base_playlist->get_random_songs(1); - $results['object_id'] = $data['song']; + $results['object_id'] = $data['0']; } return $results['object_id']; diff --git a/templates/show_album.inc b/templates/show_album.inc index ae2825af..69814d02 100644 --- a/templates/show_album.inc +++ b/templates/show_album.inc @@ -34,7 +34,7 @@ $username = $GLOBALS['user']->username; $title = scrub_out($album->name) . ' -- ' . $album->f_artist; ?> <?php require (conf('prefix') . '/templates/show_box_top.inc.php'); ?> - <div style="display:table-cell;width:140px;"> + <div style="float:left;display:table-cell;width:140px;"> <?php if ($album_name != "Unknown (Orphaned)") { $aa_url = $web_path . "/albumart.php?id=" . $album->id . "&type=popup"; |