diff options
| author | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2007-12-25 15:29:01 +0000 |
|---|---|---|
| committer | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2007-12-25 15:29:01 +0000 |
| commit | b89350528c02ff220c2cf67ea590fc667823a607 (patch) | |
| tree | 6f7c963ede7b699ad34f28d0918bebfe516397b0 /lib | |
| parent | 37c5f052baca5ffd8130468464cf8a9a91d83ece (diff) | |
| download | ampache-b89350528c02ff220c2cf67ea590fc667823a607.tar.gz ampache-b89350528c02ff220c2cf67ea590fc667823a607.tar.bz2 ampache-b89350528c02ff220c2cf67ea590fc667823a607.zip | |
removed duplicate creation of tmpplaylist with flash player
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/class/stream.class.php | 19 | ||||
| -rw-r--r-- | lib/init.php | 2 |
2 files changed, 4 insertions, 17 deletions
diff --git a/lib/class/stream.class.php b/lib/class/stream.class.php index 179e9eed..7d9092fc 100644 --- a/lib/class/stream.class.php +++ b/lib/class/stream.class.php @@ -352,8 +352,7 @@ class Stream { $flash_hack = ''; if (isset($_REQUEST['flash_hack'])) { - $flash_hack = '&flash_hack=' . $_REQUEST['flash_hack']; - if (!Config::get('require_session')) { $flash_hack .= '&sid=' . session_id(); } + if (!Config::get('require_session')) { $flash_hack = '&sid=' . session_id(); } } // Itterate through the songs @@ -392,27 +391,15 @@ class Stream { */ function create_xspf_player() { - /* First insert the songs we've got into - * a tmp_playlist - */ - $tmp_playlist = new tmpPlaylist(); - $playlist_id = $tmp_playlist->create($this->sess,'xspf','song',''); - $tmp_playlist = new tmpPlaylist($playlist_id); - - /* Add the songs to this new playlist */ - foreach ($this->songs as $song_id) { - $tmp_playlist->add_object($song_id,'song'); - } // end foreach - /* Build the extra info we need to have it pass */ - $play_info = "?action=show&tmpplaylist_id=" . $tmp_playlist->id; + $play_info = "?action=show&tmpplaylist_id=" . $GLOBALS['user']->playlist->id; // start ugly evil javascript code //FIXME: This needs to go in a template, here for now though //FIXME: This preference doesn't even exists, we'll eventually //FIXME: just make it the default if ($GLOBALS['user']->prefs['embed_xspf'] == 1 ){ - header("Location: ".Config::get('web_path')."/index.php?xspf&play_info=".$tmp_playlist->id); + header("Location: ".Config::get('web_path')."/index.php?xspf&play_info=".$GLOBALS['user']->playlist->id); } else { echo "<html><head>\n"; diff --git a/lib/init.php b/lib/init.php index 646460ef..35a56a1f 100644 --- a/lib/init.php +++ b/lib/init.php @@ -81,7 +81,7 @@ if (!count($results)) { } /** This is the version.... fluf nothing more... **/ -$results['version'] = '3.4-Beta1'; +$results['version'] = '3.4-Beta2 Build (001)'; $results['int_config_version'] = '6'; $results['raw_web_path'] = $results['web_path']; |