Merge branch 'devel' of dev.sourcefabric.org:airtime into devel

2012-09-11 17:40:36 -04:00 · 2012-09-11 17:40:36 -04:00 · acaf5f76c2
parent ceccb547c2 bc5718ec09
commit acaf5f76c2
1 changed files with 2 additions and 1 deletions
--- a/airtime_mvc/application/controllers/ApiController.php
+++ b/airtime_mvc/application/controllers/ApiController.php
@ -551,7 +551,8 @@ class ApiController extends Zend_Controller_Action

            return $return_hash;
        }
-        $return_hash['fileid'] = $file->getId();
+
+        $return_hash['fileid'] = is_null($file) ? '-1' : $file->getId();

        return $return_hash;
    }