1
0
Fork 0
mirror of https://github.com/Yetangitu/ampache synced 2025-10-03 01:39:28 +02:00

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

Conflicts:
	templates/show_album_row.inc.php
	templates/show_artist_row.inc.php
	templates/show_label_row.inc.php
	templates/show_playlist_song_row.inc.php
	templates/show_song_row.inc.php
	templates/show_video_row.inc.php

Apply align_equals and concat_with_spaces on code style
This commit is contained in:
Afterster 2015-11-07 08:08:59 +01:00
commit 5124a5ed4c
303 changed files with 4334 additions and 4561 deletions

View file

@ -40,7 +40,7 @@ switch ($_REQUEST['action']) {
// Get the current localplay fields
$localplay = new Localplay(AmpConfig::get('localplay_controller'));
$fields = $localplay->get_instance_fields();
$fields = $localplay->get_instance_fields();
require_once AmpConfig::get('prefix') . UI::find_template('show_localplay_add_instance.inc.php');
break;
case 'add_instance':
@ -72,8 +72,8 @@ switch ($_REQUEST['action']) {
break;
}
$localplay = new Localplay(AmpConfig::get('localplay_controller'));
$instance = $localplay->get_instance($_REQUEST['instance']);
$fields = $localplay->get_instance_fields();
$instance = $localplay->get_instance($_REQUEST['instance']);
$fields = $localplay->get_instance_fields();
require_once AmpConfig::get('prefix') . UI::find_template('show_localplay_edit_instance.inc.php');
break;
case 'show_instances':
@ -84,7 +84,7 @@ switch ($_REQUEST['action']) {
}
$localplay = new Localplay(AmpConfig::get('localplay_controller'));
$instances = $localplay->get_instances();
$fields = $localplay->get_instance_fields();
$fields = $localplay->get_instance_fields();
require_once AmpConfig::get('prefix') . UI::find_template('show_localplay_instances.inc.php');
break;
case 'show_playlist':