yetangitu/ampache
1
0
Fork 0
mirror of https://github.com/Yetangitu/ampache synced 2025-10-05 19:41:55 +02:00
Code Issues Releases Wiki Activity

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

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

6
modules/plugins/StreamTime/StreamTime.plugin.php
View file

@ -98,9 +98,9 @@ class AmpacheStreamTime
$next_total += $media->time;
}
$graph = new Graph();
$end_date = time();
$start_date = $end_date - ($this->time_days * 86400);
$graph = new Graph();
$end_date = time();
$start_date = $end_date - ($this->time_days * 86400);
$current_total = $graph->get_total_time($this->user_id, $start_date, $end_date);
$next_total += $current_total;
$max = $this->time_max * 60;