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

This commit is contained in:
james 2011-07-08 17:46:50 -04:00
commit ece84a04c5
8 changed files with 73 additions and 56 deletions

View file

@ -121,7 +121,7 @@ class ApiController extends Zend_Controller_Action
//make sure to exit here so that no other output is sent.
exit;
} else {
$logger->err('Resource in database, but not in storage: '.$filepath.' '.is_file($filepath));
$logger->err('Resource in database, but not in storage: "'.$filepath.'"');
}
} else {
$logger->err('$media != null && !PEAR::isError($media)');

View file

@ -207,25 +207,4 @@ class LibraryController extends Zend_Controller_Action
}
}
}