diff options
| author | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2006-04-19 00:30:36 +0000 |
|---|---|---|
| committer | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2006-04-19 00:30:36 +0000 |
| commit | fd547fa826a36e5c37ace61626be9659f9992b6f (patch) | |
| tree | 6336837d827a8789a7ca332b8d5dd8d749ce9d13 | |
| parent | 054b03b2abe487b9283cadc7932ff1423dadbef7 (diff) | |
| download | ampache-fd547fa826a36e5c37ace61626be9659f9992b6f.tar.gz ampache-fd547fa826a36e5c37ace61626be9659f9992b6f.tar.bz2 ampache-fd547fa826a36e5c37ace61626be9659f9992b6f.zip | |
unfudged the playlists stuff I broke last night
| -rw-r--r-- | lib/class/song.class.php | 3 | ||||
| -rw-r--r-- | lib/class/stream.class.php | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/lib/class/song.class.php b/lib/class/song.class.php index 45b37f1e..271d96fd 100644 --- a/lib/class/song.class.php +++ b/lib/class/song.class.php @@ -719,8 +719,9 @@ class Song { /* Account for retarded players */ if ($song->type == 'flac') { $type = 'ogg'; } + $song_name = rawurlencode($song->f_artist_full . " - " . $song->title . "." . $song->type); - $url = conf('web_path') . "/play/index.php?song=$song_id&uid=$username&sid=$session$ds_string&name=$type"; + $url = conf('web_path') . "/play/index.php?song=$song_id&uid=$username&sid=$session$ds_string&name=$song_name"; return $url; diff --git a/lib/class/stream.class.php b/lib/class/stream.class.php index 2305a965..da918fc2 100644 --- a/lib/class/stream.class.php +++ b/lib/class/stream.class.php @@ -114,7 +114,7 @@ class Stream { if($GLOBALS['user']->prefs['play_type'] == 'downsample') { $ds = $GLOBALS['user']->prefs['sample_rate']; } - echo $song->get_url(); + echo $song->get_url() . "\n"; } // end foreach } // create_m3u |