Merge branch 'master' into CC-2301

2013-05-02 16:59:47 -04:00 · 2013-05-02 16:59:47 -04:00 · bd1c1fa32f
parent 435bb83588 ca22a25827
commit bd1c1fa32f
1 changed files with 1 additions and 1 deletions
--- a/airtime_mvc/application/controllers/ApiController.php
+++ b/airtime_mvc/application/controllers/ApiController.php
@ -351,7 +351,7 @@ class ApiController extends Zend_Controller_Action
        $data = Application_Model_Schedule::getSchedule();
        header("Content-Type: application/json");

-        echo json_encode($data, JSON_FORCE_OBJECT);
+        $data = json_encode($data, JSON_FORCE_OBJECT);
        $this->_helper->json->sendJson($data, false, true);
    }