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

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

Browse source
This commit is contained in:
Duncan Sommerville 2014-11-19 15:21:14 -05:00
commit c627342e28
104 changed files with 31315 additions and 20071 deletions
Download patch file Download diff file Expand all files Collapse all files

5
airtime_mvc/application/modules/rest/controllers/MediaController.php
View file

@ -237,7 +237,7 @@ class Rest_MediaController extends Zend_Rest_Controller
//as a foreign key to cc_music_dirs.
if (isset($requestData["full_path"])) {
$fileSizeBytes = filesize($requestData["full_path"]);
if ($fileSizeBytes === false)
if (!isset($fileSizeBytes) || $fileSizeBytes === false)
{
$file->setDbImportStatus(self::IMPORT_STATUS_FAILED)->save();
$this->fileNotFoundResponse();
@ -280,8 +280,7 @@ class Rest_MediaController extends Zend_Rest_Controller
{
return;
}
$id = $this->getId();
if (!$id) {
return;