diff options
author | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2007-01-09 17:46:02 +0000 |
---|---|---|
committer | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2007-01-09 17:46:02 +0000 |
commit | 50acbaf501760e18b5595463e9dd20f0aafa861d (patch) | |
tree | c3fc5559e7af6d3b3b112094128a5d92da3eb7bf | |
parent | 8ed4a1e163f8750820f643b4f81b04215154e972 (diff) | |
download | ampache-50acbaf501760e18b5595463e9dd20f0aafa861d.tar.gz ampache-50acbaf501760e18b5595463e9dd20f0aafa861d.tar.bz2 ampache-50acbaf501760e18b5595463e9dd20f0aafa861d.zip |
moved a header display reference so I can pass headers on democratic play
-rwxr-xr-x | docs/CHANGELOG | 2 | ||||
-rw-r--r-- | play/index.php | 2 | ||||
-rw-r--r-- | templates/show_tv.inc.php | 2 | ||||
-rw-r--r-- | tv.php | 1 |
4 files changed, 5 insertions, 2 deletions
diff --git a/docs/CHANGELOG b/docs/CHANGELOG index fd82bcfe..9a14f2c0 100755 --- a/docs/CHANGELOG +++ b/docs/CHANGELOG @@ -4,6 +4,8 @@ -------------------------------------------------------------------------- v.3.3.3 + - Fixed a play issue on democratic play created when I added + the menu - Fixed batch page to correctly show access denied rather then redirecting on error - Fixed Genre actions to actually work diff --git a/play/index.php b/play/index.php index 8e07e6d2..1f55f1e2 100644 --- a/play/index.php +++ b/play/index.php @@ -127,7 +127,7 @@ if (!$song->file OR ( !is_readable($song->file) AND $catalog->catalog_type != 'r $tmp_playlist->delete_track($song_id); } - debug_event('file_not_found',"Error song ($song->title) does not have a valid filename specified",'2'); + debug_event('file_not_found',"Error song $song->file ($song->title) does not have a valid filename specified",'2'); echo "Error: Invalid Song Specified, file not found or file unreadable"; exit; } diff --git a/templates/show_tv.inc.php b/templates/show_tv.inc.php index 72f8aa92..c01517ed 100644 --- a/templates/show_tv.inc.php +++ b/templates/show_tv.inc.php @@ -22,6 +22,8 @@ $htmllang = str_replace("_","-",conf('lang')); $location = get_location(); +show_template('header'); + /** * Check for the refresh mojo, if it's there then require the * refresh_javascript include. Must be greater then 5, I'm not @@ -32,7 +32,6 @@ if (!conf('allow_democratic_playback')) { /* Clean up the stuff we need */ $action = scrub_in($_REQUEST['action']); -show_template('header'); switch ($action) { case 'create_playlist': |