Merge pull request #509 from willtp87/7.x

less batches

includes/derivatives.inc

@@ -21,6 +21,13 @@ function islandora_run_derivatives(AbstractObject $object, $dsid) {
     islandora_derivative_logging($logging_results);
   }
   else {
+    $operations = islandora_do_batch_derivatives(
+      $object,
+      array(
+        'source_dsid' => $dsid,
+      )
+    );
+    if ($operations) {
       batch_set(
         // Title won't show for batch in a batch.
         array(
@@ -32,15 +39,11 @@ function islandora_run_derivatives(AbstractObject $object, $dsid) {
             array('@label' => $object->label)
           ),
           'file' => drupal_get_path('module', 'islandora') . '/includes/regenerate_derivatives.form.inc',
-        'operations' => islandora_do_batch_derivatives(
+          'operations' => $operations,
-          $object,
-          array(
-            'source_dsid' => $dsid,
-          )
-        ),
         )
       );
     }
+  }
 }
 
 /**