summaryrefslogtreecommitdiffstats
path: root/lib/class/song.class.php
diff options
context:
space:
mode:
authorKarl 'vollmerk' Vollmer <vollmer@ampache.org>2006-04-22 19:05:59 +0000
committerKarl 'vollmerk' Vollmer <vollmer@ampache.org>2006-04-22 19:05:59 +0000
commit9c65bbb26cf5ee302ce8bfa4a196c3f8255ac359 (patch)
tree255f0627f4feea73aea22446f2725dfa9634c6b8 /lib/class/song.class.php
parente3a736e7efd4b8f9a36e0c246adf9605e47e7eb0 (diff)
downloadampache-9c65bbb26cf5ee302ce8bfa4a196c3f8255ac359.tar.gz
ampache-9c65bbb26cf5ee302ce8bfa4a196c3f8255ac359.tar.bz2
ampache-9c65bbb26cf5ee302ce8bfa4a196c3f8255ac359.zip
reverted change, the &amp does work because this isnt displayed by a browser
Diffstat (limited to 'lib/class/song.class.php')
-rw-r--r--lib/class/song.class.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/class/song.class.php b/lib/class/song.class.php
index c6fdcff9..d1a985b4 100644
--- a/lib/class/song.class.php
+++ b/lib/class/song.class.php
@@ -711,12 +711,12 @@ class Song {
$username = $GLOBALS['user']->username;
$song_id = $this->id;
if (conf('require_session')) {
- $session_string = "&amp;sid=" . session_id();
+ $session_string = "&sid=" . session_id();
} // if they are requiring a session
$type = $this->type;
if ($GLOBALS['user']->prefs['play_type'] == 'downsample') {
- $ds_string = "&amp;ds=" . $GLOBALS['user']->prefs['sample_rate'];
+ $ds_string = "&ds=" . $GLOBALS['user']->prefs['sample_rate'];
}
/* Account for retarded players */
@@ -724,7 +724,7 @@ class Song {
$this->format_song();
$song_name = rawurlencode($this->f_artist_full . " - " . $this->title . "." . $this->type);
- $url = conf('web_path') . "/play/index.php?song=$song_id&amp;uid=$username$session_string$ds_string&amp;name=$song_name";
+ $url = conf('web_path') . "/play/index.php?song=$song_id&uid=$username$session_string$ds_string&name=$song_name";
return $url;