Merge branch 'cc-5709-airtime-analyzer' into saas

Conflicts:
	python_apps/airtime_analyzer/airtime_analyzer/status_reporter.py
This commit is contained in:
Albert Santoni 2014-11-12 17:04:00 -05:00
commit 864352c6a7
2 changed files with 2 additions and 1 deletions

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();