yetangitu/ampache
1
0
Fork 0
mirror of https://github.com/Yetangitu/ampache synced 2025-10-06 03:49:56 +02:00
Code Issues Releases Wiki Activity

Merge branch 'develop' of https://github.com/Niols/ampache into Niols-develop

Browse source 
Conflicts:
	admin/users.php
	config/ampache.cfg.php.dist
	lib/class/api.class.php
	lib/class/userflag.class.php
	lib/rating.lib.php
	lib/ui.lib.php
	sql/ampache.sql
	templates/browse_filters.inc.php
	templates/footer.inc.php
	templates/header.inc.php
	templates/show_albums.inc.php
	templates/show_artists.inc.php
	templates/show_broadcasts.inc.php
	templates/show_catalogs.inc.php
	templates/show_channels.inc.php
	templates/show_concerts.inc.php
	templates/show_democratic_playlist.inc.php
	templates/show_html5_player_headers.inc.php
	templates/show_index.inc.php
	templates/show_install_config.inc.php
	templates/show_labels.inc.php
	templates/show_live_streams.inc.php
	templates/show_localplay_playlist.inc.php
	templates/show_login_form.inc.php
	templates/show_manage_license.inc.php
	templates/show_manage_shoutbox.inc.php
	templates/show_missing_albums.inc.php
	templates/show_objects.inc.php
	templates/show_playlist_songs.inc.php
	templates/show_playlists.inc.php
	templates/show_preferences.inc.php
	templates/show_pvmsgs.inc.php
	templates/show_recommended_artists.inc.php
	templates/show_searches.inc.php
	templates/show_shared_objects.inc.php
	templates/show_song_previews.inc.php
	templates/show_songs.inc.php
	templates/show_tvshow_seasons.inc.php
	templates/show_tvshows.inc.php
	templates/show_user_activate.inc.php
	templates/show_users.inc.php
	templates/show_videos.inc.php
	templates/show_wanted_albums.inc.php
	templates/sidebar.inc.php
	templates/stylesheets.inc.php
This commit is contained in:
Afterster 2015-09-06 11:23:51 +02:00
commit 207076d9a0
126 changed files with 375 additions and 340 deletions
Download patch file Download diff file Expand all files Collapse all files

8
server/localplay.ajax.php
View file

@ -44,7 +44,7 @@ switch ($_REQUEST['action']) {
// We should also refesh the sidebar
ob_start();
require_once AmpConfig::get('prefix') . '/templates/sidebar.inc.php';
require_once AmpConfig::get('prefix') . UI::find_template('sidebar.inc.php');
$results['sidebar-content'] = ob_get_contents();
ob_end_clean();
break;
@ -77,7 +77,7 @@ switch ($_REQUEST['action']) {
// We actually want to refresh something here
ob_start();
$objects = $localplay->get();
require_once AmpConfig::get('prefix') . '/templates/show_localplay_status.inc.php';
require_once AmpConfig::get('prefix') . UI::find_template('show_localplay_status.inc.php');
$results['localplay_status'] = ob_get_contents();
ob_end_clean();
break;
@ -170,7 +170,7 @@ switch ($_REQUEST['action']) {
ob_start();
$objects = $localplay->get();
require_once AmpConfig::get('prefix') . '/templates/show_localplay_status.inc.php';
require_once AmpConfig::get('prefix') . UI::find_template('show_localplay_status.inc.php');
$results['localplay_status'] = ob_get_contents();
ob_end_clean();
@ -189,7 +189,7 @@ switch ($_REQUEST['action']) {
ob_start();
$objects = $localplay->get();
require_once AmpConfig::get('prefix') . '/templates/show_localplay_status.inc.php';
require_once AmpConfig::get('prefix') . UI::find_template('show_localplay_status.inc.php');
$results['localplay_status'] = ob_get_contents();
ob_end_clean();