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

Fix SoundCloud and TaskManager bugs, switch tasks to use acks_late, and provide feedback from SoundCloud context menu items

Browse source
This commit is contained in:
Duncan Sommerville 2015-06-18 18:18:48 -04:00
parent 17983167ed
commit 76a7aa9a24
6 changed files with 50 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
airtime_mvc/application/models/airtime/CcFiles.php
View file

@ -74,6 +74,8 @@ class CcFiles extends BaseCcFiles {
/** Used to create a CcFiles object from an array containing metadata and a file uploaded by POST.
* This is used by our Media REST API!
* @param $fileArray An array containing metadata for a CcFiles object.
*
* @return object the sanitized response
* @throws Exception
*/
public static function createFromUpload($fileArray)
@ -94,7 +96,7 @@ class CcFiles extends BaseCcFiles {
$tempFilePath = $_FILES['file']['tmp_name'];
try {
self::createAndImport($fileArray, $tempFilePath, $originalFilename);
return self::createAndImport($fileArray, $tempFilePath, $originalFilename);
} catch (Exception $e) {
if (file_exists($tempFilePath)) {
unlink($tempFilePath);