Merge remote-tracking branch 'origin/master' into fix/sort-auto-playlist-alpha
This commit is contained in:
commit
4b62bafdf2
|
@ -425,6 +425,7 @@ class ApiController extends Zend_Controller_Action
|
||||||
$this->view->layout()->disableLayout();
|
$this->view->layout()->disableLayout();
|
||||||
$this->_helper->viewRenderer->setNoRender(true);
|
$this->_helper->viewRenderer->setNoRender(true);
|
||||||
|
|
||||||
|
$request = $this->getRequest();
|
||||||
$result = WidgetHelper::getWeekInfo($this->getRequest()->getParam("timezone"));
|
$result = WidgetHelper::getWeekInfo($this->getRequest()->getParam("timezone"));
|
||||||
|
|
||||||
//used by caller to determine if the airtime they are running or widgets in use is out of date.
|
//used by caller to determine if the airtime they are running or widgets in use is out of date.
|
||||||
|
|
Loading…
Reference in New Issue