Merge pull request #477 from willtp87/7.x.derivative_args

passing derivative deffinition to callback (usefull for single callback ...

includes/derivatives.inc

@@ -49,7 +49,7 @@ function islandora_do_derivatives(AbstractObject $object, array $options) {
     }
     foreach ($hook['function'] as $function) {
       if (function_exists($function)) {
-        $logging = call_user_func($function, $object, $options['force']);
+        $logging = call_user_func($function, $object, $options['force'], $hook);
         if (!empty($logging)) {
           $results[] = $logging;
         }
@@ -142,11 +142,15 @@ function islandora_do_batch_derivatives(AbstractObject $object, array $options)
       $file = $hook['file'];
     }
     foreach ($hook['function'] as $function) {
-      $operations[] = array('islandora_derivative_perform_batch_operation', array(
-        $function,
-        $file,
-        $object->id,
-        $options['force']),
+      $operations[] = array(
+        'islandora_derivative_perform_batch_operation',
+        array(
+          $function,
+          $file,
+          $object->id,
+          $options['force'],
+          $hook,
+        ),
       );
     }
   }

islandora.api.php

@@ -635,7 +635,7 @@ function hook_CMODEL_PID_islandora_overview_object_alter(AbstractObject &$object
  *   - function: An array of function(s) to be ran when constructing
  *     derivatives. Functions that are defined to be called for derivation
  *     creation must have the following structure:
- *     module_name_derivative_creation_function($object, $force = FALSE)
+ *     module_name_derivative_creation_function($object, $force = FALSE, $hook)
  *     These functions must return an array in the structure of:
  *     - success: Bool denoting whether the operation was successful.
  *     - messages: An array structure containing zero or more array's with the