summaryrefslogtreecommitdiffstats
path: root/lib/class/song.class.php
diff options
context:
space:
mode:
authorKarl 'vollmerk' Vollmer <vollmer@ampache.org>2009-02-02 04:25:25 +0000
committerKarl 'vollmerk' Vollmer <vollmer@ampache.org>2009-02-02 04:25:25 +0000
commit00effbf55451016e5863e27de93344dfb4a50216 (patch)
treefe1300051d65f14fd34dd53bc7148a47c8e3d5a6 /lib/class/song.class.php
parent0a2b41b143419e85b968a675c8b83a1c15615399 (diff)
downloadampache-00effbf55451016e5863e27de93344dfb4a50216.tar.gz
ampache-00effbf55451016e5863e27de93344dfb4a50216.tar.bz2
ampache-00effbf55451016e5863e27de93344dfb4a50216.zip
Add very basic buggy as crap video support, fix a few other minor bugs with playlists and random elements
Diffstat (limited to 'lib/class/song.class.php')
-rw-r--r--lib/class/song.class.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/class/song.class.php b/lib/class/song.class.php
index 36722b47..66a36d16 100644
--- a/lib/class/song.class.php
+++ b/lib/class/song.class.php
@@ -859,13 +859,13 @@ class Song extends database_object {
$web_path = Config::get('web_path');
-
+ //FIXME: REPLACE WITH Stream::get_base_url
if (Config::get('force_http_play') OR !empty($force_http)) {
$port = Config::get('http_port') ? ':' . Config::get('http_port') : '';
$web_path = str_replace("https://" . $_SERVER['HTTP_HOST'], "http://" . $_SERVER['SERVER_NAME'] . $port,$web_path);
}
- $url = $web_path . "/play/index.php?song=$song_id&uid=$user_id$session_string$ds_string&name=/$song_name";
+ $url = $web_path . "/play/index.php?oid=$song_id&uid=$user_id$session_string$ds_string&name=/$song_name";
return $url;