revert jsonEncode change not supported by older zend versions
This commit is contained in:
parent
1e25d786ee
commit
d902d38429
|
@ -288,7 +288,7 @@ class ApiController extends Zend_Controller_Action
|
|||
|
||||
//used by caller to determine if the airtime they are running or widgets in use is out of date.
|
||||
$result['AIRTIME_API_VERSION'] = AIRTIME_API_VERSION;
|
||||
header("Content-type: text/javascript");
|
||||
header("Content-Type: application/json");
|
||||
|
||||
// If a callback is not given, then just provide the raw JSON.
|
||||
echo isset($_GET['callback']) ? $_GET['callback'].'('.json_encode($result).')' : json_encode($result);
|
||||
|
@ -348,11 +348,14 @@ class ApiController extends Zend_Controller_Action
|
|||
|
||||
public function scheduleAction()
|
||||
{
|
||||
$data = Application_Model_Schedule::getSchedule();
|
||||
$this->view->layout()->disableLayout();
|
||||
$this->_helper->viewRenderer->setNoRender(true);
|
||||
|
||||
header("Content-Type: application/json");
|
||||
|
||||
$data = json_encode($data, JSON_FORCE_OBJECT);
|
||||
$this->_helper->json->sendJson($data, false, true);
|
||||
$data = Application_Model_Schedule::getSchedule();
|
||||
|
||||
echo json_encode($data, JSON_FORCE_OBJECT);
|
||||
}
|
||||
|
||||
public function notifyMediaItemStartPlayAction()
|
||||
|
|
Loading…
Reference in New Issue