diff options
| author | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2010-01-25 14:31:39 +0000 |
|---|---|---|
| committer | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2010-01-25 14:31:39 +0000 |
| commit | 77c5628d447a7c86b4e193c3986f4d7262dc2ac4 (patch) | |
| tree | 63aee43787313825ff3e2344a9f271c499a16ec8 | |
| parent | 2fd6fe6d88466960608cd7de18e6489664bd567e (diff) | |
| download | ampache-77c5628d447a7c86b4e193c3986f4d7262dc2ac4.tar.gz ampache-77c5628d447a7c86b4e193c3986f4d7262dc2ac4.tar.bz2 ampache-77c5628d447a7c86b4e193c3986f4d7262dc2ac4.zip | |
Sync from 3.5 branch still untested
| -rw-r--r-- | lib/class/stream.class.php | 2 | ||||
| -rw-r--r-- | play/index.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/class/stream.class.php b/lib/class/stream.class.php index cc01ed94..3875da6b 100644 --- a/lib/class/stream.class.php +++ b/lib/class/stream.class.php @@ -855,7 +855,7 @@ class Stream { public static function get_base_url() { if (Config::get('require_session')) { - $session_string = 'sid=' . Stream::get_session() . '&'; + $session_string = 'ssid=' . Stream::get_session() . '&'; } $web_path = Config::get('web_path'); diff --git a/play/index.php b/play/index.php index 191492a6..6123e81e 100644 --- a/play/index.php +++ b/play/index.php @@ -33,7 +33,7 @@ ob_end_clean(); /* These parameters had better come in on the url. */ $uid = scrub_in($_REQUEST['uid']); $oid = $_REQUEST['song'] ? scrub_in($_REQUEST['song']) : scrub_in($_REQUEST['oid']); -$sid = scrub_in($_REQUEST['sid']); +$sid = scrub_in($_REQUEST['ssid']); $xml_rpc = scrub_in($_REQUEST['xml_rpc']); $video = make_bool($_REQUEST['video']); |