Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'cc-4384-remove-table-calling-with-cc-config' into devel

Browse source 
Conflicts:
	airtime_mvc/application/Bootstrap.php
This commit is contained in:
James 2013-01-14 16:19:51 -05:00
commit 9ae3559305
34 changed files with 134 additions and 165 deletions
Download patch file Download diff file Expand all files Collapse all files

6
airtime_mvc/application/controllers/ScheduleController.php
View file

@ -40,7 +40,7 @@ class ScheduleController extends Zend_Controller_Action
public function indexAction()
{
global $CC_CONFIG;
$CC_CONFIG = Config::getConfig();
$baseUrl = Application_Common_OsPath::getBaseDir();
@ -879,8 +879,6 @@ class ScheduleController extends Zend_Controller_Action
public function contentContextMenuAction()
{
global $CC_CONFIG;
$id = $this->_getParam('id');
$params = '/format/json/id/#id#/';
@ -922,8 +920,6 @@ class ScheduleController extends Zend_Controller_Action
public function calculateDurationAction()
{
global $CC_CONFIG;
$startParam = $this->_getParam('startTime');
$endParam = $this->_getParam('endTime');