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

This commit is contained in:
denise 2012-05-07 12:02:15 -04:00
commit 3a6a1d8691
3 changed files with 20 additions and 6 deletions

View file

@ -120,14 +120,10 @@ class Application_Model_ShowInstance {
{
$file_id = $this->_showInstance->getDbRecordedFile();
if(isset($file_id)) {
if (isset($file_id)) {
$file = Application_Model_StoredFile::Recall($file_id);
if (PEAR::isError($file)) {
return null;
}
if(file_exists($file->getFilePath())) {
if (isset($file) && file_exists($file->getFilePath())) {
return $file;
}
}