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

4
airtime_mvc/application/models/StoredFile.php
View file

@ -504,7 +504,7 @@ SQL;
*/
public function getFileUrlUsingConfigAddress()
{
global $CC_CONFIG;
$CC_CONFIG = Config::getConfig();
if (isset($CC_CONFIG['baseUrl'])) {
$serverName = $CC_CONFIG['baseUrl'];
@ -1218,7 +1218,7 @@ SQL;
// note: never call this method from controllers because it does a sleep
public function uploadToSoundCloud()
{
global $CC_CONFIG;
$CC_CONFIG = Config::getConfig();
$file = $this->_file;
if (is_null($file)) {