Merge branch 'saas-dev' of https://github.com/sourcefabric/Airtime into saas-dev

This commit is contained in:
drigato 2015-05-20 07:06:22 -04:00
commit 506b9cb248

View file

@ -112,11 +112,6 @@ class Application_Model_RabbitMq
$data['original_filename'] = $originalFilename; $data['original_filename'] = $originalFilename;
$data['callback_url'] = $callbackUrl; $data['callback_url'] = $callbackUrl;
$data['api_key'] = $apiKey; $data['api_key'] = $apiKey;
// Pass station name to the analyzer so we can set it with the file's
// metadata before uploading it to the cloud. This isn't a requirement
// for cloud storage, but put there as a safeguard, since all Airtime
// Pro stations will share the same bucket.
$data['station_domain'] = $stationDomain = Application_Model_Preference::GetStationName();
// We add a prefix to the resource name so files are not all placed // We add a prefix to the resource name so files are not all placed
// under the root folder. We do this in case we need to restore a // under the root folder. We do this in case we need to restore a