From 52921374303047e5029ed5d741b4274eb6028063 Mon Sep 17 00:00:00 2001 From: Martin Konecny Date: Mon, 10 Sep 2012 16:54:42 -0400 Subject: [PATCH] -return json as data type for schedule action --- airtime_mvc/application/controllers/ApiController.php | 1 + airtime_mvc/application/models/Webstream.php | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/airtime_mvc/application/controllers/ApiController.php b/airtime_mvc/application/controllers/ApiController.php index 1045255e0..66ff34c22 100644 --- a/airtime_mvc/application/controllers/ApiController.php +++ b/airtime_mvc/application/controllers/ApiController.php @@ -337,6 +337,7 @@ class ApiController extends Zend_Controller_Action $this->_helper->viewRenderer->setNoRender(true); $data = Application_Model_Schedule::getSchedule(); + header("Content-Type: application/json"); echo json_encode($data, JSON_FORCE_OBJECT); } diff --git a/airtime_mvc/application/models/Webstream.php b/airtime_mvc/application/models/Webstream.php index b1d4b2b77..4f721c567 100644 --- a/airtime_mvc/application/models/Webstream.php +++ b/airtime_mvc/application/models/Webstream.php @@ -262,7 +262,6 @@ class Application_Model_Webstream implements Application_Model_LibraryEditable private static function getPlsUrl($url) { $content = self::getUrlData($url); - $ini = parse_ini_string($content, true); if ($ini !== false && isset($ini["playlist"]) && isset($ini["playlist"]["File1"])) {