Merge branch '1.9.1' into devel

This commit is contained in:
James 2011-08-31 10:15:00 -04:00
commit c460519a88
5 changed files with 16 additions and 10 deletions

View file

@ -178,9 +178,10 @@ class LibraryController extends Zend_Controller_Action
{
$request = $this->getRequest();
$form = new Application_Form_EditAudioMD();
$file_id = $this->_getParam('id', null);
$file = StoredFile::Recall($file_id);
$form->populate($file->getDbColMetadata());
if ($request->isPost()) {
if ($form->isValid($request->getPost())) {
@ -196,7 +197,6 @@ class LibraryController extends Zend_Controller_Action
}
}
$form->populate($file->getDbColMetadata());
$this->view->form = $form;
}