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

Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas 

Conflicts:
	airtime_mvc/application/configs/conf.php
This commit is contained in:
Albert Santoni 2014-04-22 15:57:08 -04:00
parent 97ce5bdbc5 e7482e52f7
commit 0a4a0d387a
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
airtime_mvc/application/configs/conf.php
View File

@ -36,7 +36,7 @@ class Config {
$CC_CONFIG['basePort'] = $values['general']['base_port']; $CC_CONFIG['basePort'] = $values['general']['base_port'];
$CC_CONFIG['phpDir'] = $values['general']['airtime_dir']; $CC_CONFIG['phpDir'] = $values['general']['airtime_dir'];
if (isset($values['general']['dev_env'])) { if (isset($values['general']['dev_env'])) {
$CC_CONFIG['dev_env'] == $values['general']['dev_env']; $CC_CONFIG['dev_env'] = $values['general']['dev_env'];
} else { } else {
$CC_CONFIG['dev_env'] = 'production'; $CC_CONFIG['dev_env'] = 'production';
} }