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

Merge branch 'saas-dev' into soundcloud

Browse source 
Conflicts:
	airtime_mvc/application/configs/constants.php
This commit is contained in:
Duncan Sommerville 2015-06-29 10:02:58 -04:00
commit 5cc8774e56
30 changed files with 194 additions and 182 deletions
Download patch file Download diff file Expand all files Collapse all files

4
airtime_mvc/application/controllers/ApiController.php
View file

@ -170,7 +170,7 @@ class ApiController extends Zend_Controller_Action
$request = $this->getRequest();
$utcTimeNow = gmdate("Y-m-d H:i:s");
$utcTimeNow = gmdate(DEFAULT_TIMESTAMP_FORMAT);
$utcTimeEnd = ""; // if empty, getNextShows will use interval instead of end of day
// default to the station timezone
@ -192,7 +192,7 @@ class ApiController extends Zend_Controller_Action
// make getNextShows use end of day
$end = Application_Common_DateHelper::getTodayStationEndDateTime();
$end->setTimezone(new DateTimeZone("UTC"));
$utcTimeEnd = $end->format("Y-m-d H:i:s");
$utcTimeEnd = $end->format(DEFAULT_TIMESTAMP_FORMAT);
$result = array(
"env" => APPLICATION_ENV,