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

-fixed UI freeze on some very special occasions

Browse source 
-fixed some php errors related to php shipped with debian
-playlist.js no longer active on login page
This commit is contained in:
martin 2011-02-13 13:29:16 -05:00
parent b9e1078e10
commit a5fd68c252
6 changed files with 32 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

4
application/models/Schedule.php
View file

@ -482,10 +482,10 @@ class Schedule {
." ORDER BY st.starts DESC"
." LIMIT $count";
} else if ($timePeriod == 0){
$sql .= " AND st.starts < TIMESTAMP '$timeNow'"
$sql .= " AND st.starts <= TIMESTAMP '$timeNow'"
." AND st.ends > TIMESTAMP '$timeNow'";
} else if ($timePeriod > 0){
$sql .= " AND st.starts > TIMESTAMP '$timeNow'"
$sql .= " AND st.starts >= TIMESTAMP '$timeNow'"
." AND st.starts < (TIMESTAMP '$timeNow' + INTERVAL '$interval')"
." ORDER BY st.starts"
." LIMIT $count";

2
application/models/Shows.php
View file

@ -749,7 +749,7 @@ class Show_DAL{
$sql = "SELECT *, si.starts as start_timestamp, si.ends as end_timestamp FROM "
." $CC_CONFIG[showInstances] si, $CC_CONFIG[showTable] s"
." WHERE si.show_id = s.id"
." AND si.starts > TIMESTAMP '$timeNow'"
." AND si.starts >= TIMESTAMP '$timeNow'"
." AND si.starts < TIMESTAMP '$timeNow' + INTERVAL '48 hours'"
." ORDER BY si.starts"
." LIMIT 1";