Permalink
Browse files

Merge pull request #151 from adam-vessey/6.x

6.x
  • Loading branch information...
2 parents 14a3c2b + b617131 commit d3b2ea36b5bd0b66e43f02fa1658b7d57cf6e9f9 Jonathan Green committed Jul 20, 2012
Showing with 5 additions and 2 deletions.
  1. +3 −1 api/fedora_item.inc
  2. +2 −1 fedora_repository.module
View
@@ -980,7 +980,9 @@ RDF;
$params = array(
'pid' => $this->pid,
- 'ownerId' => $ownerId,
+ 'ownerId' => (($ownerId !== NULL)? //Default to the current owner if none is provided.
+ $ownerId:
+ $this->objectProfile->objOwnerId),
'state' => $state,
'label' => $label,
'logMessage' => $logMessage
View
@@ -797,8 +797,9 @@ function fedora_repository_edit_qdc_form(&$form_state, $pid, $dsId = NULL) {
// There is no custom function, so just load the standard QDC form.
$metaDataForm = new formClass();
//currently we only edit the dc metadata. If you defined a custom form with a custom handler you are sol for now.
- return $metaDataForm->createMetaDataForm($pid, $dsId, $client, $form_state);
+ $output = $metaDataForm->createMetaDataForm($pid, $dsId, $client, $form_state);
}
+
return $output;
}

0 comments on commit d3b2ea3

Please sign in to comment.