From 220625cedad4bc3a400d9bc0c0c6f0a103b7398f Mon Sep 17 00:00:00 2001
From: Karl 'vollmerk' Vollmer <vollmer@ampache.org>
Date: Mon, 5 May 2008 07:23:09 +0000
Subject: fixed flash player issues with specific playlist_methods

---
 docs/CHANGELOG             | 1 +
 lib/preferences.php        | 2 +-
 stream.php                 | 7 +++----
 templates/rightbar.inc.php | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/docs/CHANGELOG b/docs/CHANGELOG
index 5f65fd4c..175a2774 100755
--- a/docs/CHANGELOG
+++ b/docs/CHANGELOG
@@ -4,6 +4,7 @@
 
 --------------------------------------------------------------------------
   v.3.4 
+	- Fixed flash player not working if playlist_method included clear
 	- Fixed album art thumbs never saving due to incorrect table reference
 	- Fixed download having no filename if no catalog pattern
 	- Fixed issue where 0 sized images could be inserted into the database
diff --git a/lib/preferences.php b/lib/preferences.php
index 811f7a82..deb21dde 100644
--- a/lib/preferences.php
+++ b/lib/preferences.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/stream.php b/stream.php
index ac93e9bb..d6eada38 100644
--- a/stream.php
+++ b/stream.php
@@ -1,7 +1,7 @@
 <?php
 /*
 
- Copyright (c) 2001 - 2008 ampache.org
+ Copyright (c) Ampache.org
  All rights reserved.
 
  This program is free software; you can redistribute it and/or
@@ -21,8 +21,7 @@
 require_once 'lib/init.php';
 
 /* If we are running a demo, quick while you still can! */
-if (Config::get('demo_mode') || !$GLOBALS['user']->has_access('25')) {
-
+if (Config::get('demo_mode') || !Access::check('interface','25')) {
 	access_denied();
 	exit;
 }
@@ -62,7 +61,7 @@ switch ($_REQUEST['action']) {
 		} // end foreach
 
 		// Check to see if 'clear' was passed if it was then we need to reset the basket
-		if ( ($_REQUEST['playlist_method'] == 'clear' || Config::get('playlist_method') == 'clear') AND Config::get('play_method') != 'xspf_player') { 
+		if ( ($_REQUEST['playlist_method'] == 'clear' || Config::get('playlist_method') == 'clear') AND Config::get('play_type') != 'xspf_player') { 
 			$GLOBALS['user']->playlist->clear(); 
 		} 
 
diff --git a/templates/rightbar.inc.php b/templates/rightbar.inc.php
index 26ec3691..4a264b16 100644
--- a/templates/rightbar.inc.php
+++ b/templates/rightbar.inc.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
-- 
cgit