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

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

This commit is contained in:
Martin Konecny 2012-09-13 12:28:30 -04:00
parent 09d587e262 9dfb762bbe
commit fad6635a1a
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
airtime_mvc/application/controllers/ApiController.php
View File

@ -610,8 +610,6 @@ class ApiController extends Zend_Controller_Action
$dir_id = $request->getParam('dir_id'); $dir_id = $request->getParam('dir_id');
$all = $request->getParam('all'); $all = $request->getParam('all');
Logging::info("All param is: $all");
$this->view->files = $this->view->files =
Application_Model_StoredFile::listAllFiles($dir_id,$all); Application_Model_StoredFile::listAllFiles($dir_id,$all);
} }

1
airtime_mvc/application/controllers/LibraryController.php
View File

@ -320,6 +320,7 @@ class LibraryController extends Zend_Controller_Action
} catch (Exception $e) { } catch (Exception $e) {
//could throw a scheduled in future exception. //could throw a scheduled in future exception.
$message = "Could not delete some scheduled files."; $message = "Could not delete some scheduled files.";
Logging::info($e);
} }
} }
} }