diff options
| author | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2006-10-21 21:09:50 +0000 |
|---|---|---|
| committer | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2006-10-21 21:09:50 +0000 |
| commit | 7b49a436d0eb128b26cb2a427731074f0a9fce2b (patch) | |
| tree | 9253d2ed30ec0ab1d8979464fe8fc845d0103b73 /lib/class/song.class.php | |
| parent | 7935a4a78558ed918e009d9a3f84f242dfaa88ea (diff) | |
| download | ampache-7b49a436d0eb128b26cb2a427731074f0a9fce2b.tar.gz ampache-7b49a436d0eb128b26cb2a427731074f0a9fce2b.tar.bz2 ampache-7b49a436d0eb128b26cb2a427731074f0a9fce2b.zip | |
patched flaw in getid3() fixed a problem with vainfo and songs with no tags and fixed the xml_from_array() function
Diffstat (limited to 'lib/class/song.class.php')
| -rw-r--r-- | lib/class/song.class.php | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/lib/class/song.class.php b/lib/class/song.class.php index b437692a..f72506f8 100644 --- a/lib/class/song.class.php +++ b/lib/class/song.class.php @@ -708,13 +708,18 @@ class Song { * a stream URL taking into account the downsampling mojo and everything * else, this is used or will be used by _EVERYTHING_ */ - function get_url() { + function get_url($session_id='') { /* Define Variables we are going to need */ $username = $GLOBALS['user']->username; $song_id = $this->id; if (conf('require_session')) { - $session_string = "&sid=" . session_id(); + if ($session_id) { + $session_string = "&sid=" . $session_id; + } + else { + $session_string = "&sid=" . session_id(); + } } // if they are requiring a session $type = $this->type; |