Browse Source

passing hook info through to batch derivative creation correctly

pull/484/head
willtp87 11 years ago
parent
commit
325e3699b6
  1. 6
      includes/regenerate_derivatives.form.inc

6
includes/regenerate_derivatives.form.inc

@ -142,15 +142,17 @@ function islandora_regenerate_datastream_derivative_batch(AbstractDatastream $da
* The pid of the object we are performing. * The pid of the object we are performing.
* @param bool $force * @param bool $force
* Whether we are forcing derivative regeneration or not. * Whether we are forcing derivative regeneration or not.
* @param array $hook
* The derivative definition.
* @param array $context * @param array $context
* The context of the current batch operation. * The context of the current batch operation.
*/ */
function islandora_derivative_perform_batch_operation($function, $file, $pid, $force, &$context) { function islandora_derivative_perform_batch_operation($function, $file, $pid, $force, $hook, &$context) {
if ($file) { if ($file) {
require_once $file; require_once $file;
} }
if (function_exists($function)) { if (function_exists($function)) {
$logging = call_user_func($function, islandora_object_load($pid), $force); $logging = call_user_func($function, islandora_object_load($pid), $force, $hook);
if (!empty($logging)) { if (!empty($logging)) {
$context['results']['logging'][] = $logging; $context['results']['logging'][] = $logging;
} }

Loading…
Cancel
Save