Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'master' of dev.sourcefabric.org:campcaster

Browse source 
Conflicts:
	.zfproject.xml
	application/configs/airtime-conf.php
	build/build.properties
	public/css/styles.css
This commit is contained in:
mkonecny 2011-02-09 13:07:36 -05:00
commit 50054befd6
18 changed files with 309 additions and 115 deletions
Download patch file Download diff file Expand all files Collapse all files

2
application/models/StoredFile.php
View file

@ -1791,7 +1791,7 @@ class StoredFile {
$fromTable = "cc_playlist AS pl LEFT JOIN cc_playlisttimes AS plt USING(id) LEFT JOIN cc_subjs AS sub ON pl.editedby = sub.id";
$datatables["optWhere"][] = "plt.length <= '{$p_length}'";
$datatables["optWhere"][] = "plt.length <= INTERVAL '{$p_length}'";
return StoredFile::searchFiles($fromTable, $datatables);