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

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

Browse source
This commit is contained in:
martin 2011-03-31 19:10:27 -04:00
commit dcad4383cc
1 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
application/models/Shows.php
View file

@ -462,6 +462,11 @@ class Show {
global $CC_DBC; global $CC_DBC;
if (is_null($p_date)) { if (is_null($p_date)) {
$p_date = Application_Model_Preference::GetShowsPopulatedUntil(); $p_date = Application_Model_Preference::GetShowsPopulatedUntil();
if ($p_date == "") {
$today_timestamp = date("Y-m-d");
Application_Model_Preference::SetShowsPopulatedUntil($today_timestamp);
}
} }
$sql = "SELECT * FROM cc_show_days WHERE show_id = {$p_showId}"; $sql = "SELECT * FROM cc_show_days WHERE show_id = {$p_showId}";
@ -485,7 +490,7 @@ class Show {
{ {
global $CC_DBC; global $CC_DBC;
if ($pop_timestamp != "") { if ($p_startTimestamp != "") {
$sql = "SELECT * FROM cc_show_days $sql = "SELECT * FROM cc_show_days
WHERE last_show IS NULL WHERE last_show IS NULL
OR first_show < '{$p_endTimestamp}' AND last_show > '{$p_startTimestamp}'"; OR first_show < '{$p_endTimestamp}' AND last_show > '{$p_startTimestamp}'";