From 239a228175e9915309636781cb66869947a980a1 Mon Sep 17 00:00:00 2001 From: Martin Konecny Date: Fri, 14 Sep 2012 14:36:31 -0400 Subject: [PATCH] CC-4434: Make Application_Model_Preference::getValue and setValue private methods -small fix --- airtime_mvc/application/controllers/ShowbuilderController.php | 2 +- airtime_mvc/application/views/scripts/showbuilder/index.phtml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/airtime_mvc/application/controllers/ShowbuilderController.php b/airtime_mvc/application/controllers/ShowbuilderController.php index e1a3d60fc..833a6bc8e 100644 --- a/airtime_mvc/application/controllers/ShowbuilderController.php +++ b/airtime_mvc/application/controllers/ShowbuilderController.php @@ -37,7 +37,7 @@ class ShowbuilderController extends Zend_Controller_Action $data = Application_Model_Preference::getTimelineDatatableSetting(); if (!is_null($data)) { - $timelineTable = json_encode(unserialize($data)); + $timelineTable = json_encode($data); $this->view->headScript()->appendScript("localStorage.setItem( 'datatables-timeline', JSON.stringify($timelineTable) );"); } else { $this->view->headScript()->appendScript("localStorage.setItem( 'datatables-timeline', '' );"); diff --git a/airtime_mvc/application/views/scripts/showbuilder/index.phtml b/airtime_mvc/application/views/scripts/showbuilder/index.phtml index 6e708004c..9ad957806 100644 --- a/airtime_mvc/application/views/scripts/showbuilder/index.phtml +++ b/airtime_mvc/application/views/scripts/showbuilder/index.phtml @@ -21,4 +21,4 @@ -dialog ?> \ No newline at end of file +dialog ?>