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

Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-cloud-storage

Browse source 
Conflicts:
	python_apps/airtime_analyzer/setup.py
This commit is contained in:
drigato 2014-11-12 14:51:18 -05:00
commit f1fa4929ae
2 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -227,7 +227,7 @@ class Rest_MediaController extends Zend_Rest_Controller
$file->setDbFilepath($requestData["filename"]);
$fileSizeBytes = $requestData["filesize"];
if ($fileSizeBytes === false)
if (!isset($fileSizeBytes) || $fileSizeBytes === false)
{
$file->setDbImportStatus(2)->save();
$this->fileNotFoundResponse();
@ -242,7 +242,7 @@ class Rest_MediaController extends Zend_Rest_Controller
//we should get rid of this since we're removing local file storage
} else if (isset($requestData["full_path"])) {
$fileSizeBytes = filesize($requestData["full_path"]);
if ($fileSizeBytes === false)
if (!isset($fileSizeBytes) || $fileSizeBytes === false)
{
$file->setDbImportStatus(2)->save();
$this->fileNotFoundResponse();