diff options
| author | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2008-12-28 17:47:49 +0000 |
|---|---|---|
| committer | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2008-12-28 17:47:49 +0000 |
| commit | b43aacaabaafd431d3bada7ffc8d63b678a571c2 (patch) | |
| tree | 33efbd3497bef34742da9e2514a8883c8936bc2a | |
| parent | ffd5b55d0ad7b6b4390672d4d345089c89f996c1 (diff) | |
| download | ampache-b43aacaabaafd431d3bada7ffc8d63b678a571c2.tar.gz ampache-b43aacaabaafd431d3bada7ffc8d63b678a571c2.tar.bz2 ampache-b43aacaabaafd431d3bada7ffc8d63b678a571c2.zip | |
sync to trunk
| -rw-r--r-- | lib/class/democratic.class.php | 4 | ||||
| -rw-r--r-- | modules/infotools/lastfm.class.php | 2 | ||||
| -rw-r--r-- | modules/infotools/mp3tunes.class.php | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/lib/class/democratic.class.php b/lib/class/democratic.class.php index ca068aa5..6468f88d 100644 --- a/lib/class/democratic.class.php +++ b/lib/class/democratic.class.php @@ -236,7 +236,9 @@ class Democratic extends tmpPlaylist { */ public function get_url() { - if (Config::get('force_http_play') OR !empty($force_http)) { + $web_path = Config::get('web_path'); + + if (Config::get('force_http_play')) { $port = Config::get('http_port') ? ':' . Config::get('http_port') : ''; $web_path = str_replace("https://" . $_SERVER['HTTP_HOST'], "http://" . $_SERVER['SERVER_NAME'] . $port,$web_path); } diff --git a/modules/infotools/lastfm.class.php b/modules/infotools/lastfm.class.php index 7126ea83..ba0fc1e3 100644 --- a/modules/infotools/lastfm.class.php +++ b/modules/infotools/lastfm.class.php @@ -1,7 +1,7 @@ <?php
/*
- Copyright (c) 2001 - 2007 Ampache.org
+ Copyright (c) Ampache.org
All rights reserved.
This program is free software; you can redistribute it and/or
diff --git a/modules/infotools/mp3tunes.class.php b/modules/infotools/mp3tunes.class.php index b7e10e33..505d2806 100644 --- a/modules/infotools/mp3tunes.class.php +++ b/modules/infotools/mp3tunes.class.php @@ -470,6 +470,6 @@ class mp3tunes { } // end_element
-} // end openstrands
+} // end mp3tunes
?>
|