Browse Source

Fixed issue #280

Stephen Ficklin 7 years ago
parent
commit
2b049e9257
3 changed files with 7 additions and 4 deletions
  1. 1 1
      tripal/api/tripal.jobs.api.inc
  2. 1 1
      tripal/includes/TripalJob.inc
  3. 5 2
      tripal/tripal.module

+ 1 - 1
tripal/api/tripal.jobs.api.inc

@@ -75,7 +75,7 @@
  * @ingroup tripal_jobs_api
  * @ingroup tripal_jobs_api
  */
  */
 function tripal_add_job($job_name, $modulename, $callback, $arguments, $uid,
 function tripal_add_job($job_name, $modulename, $callback, $arguments, $uid,
-    $priority = 10, $includes = array(), $ignore_duplicate = TRUE) {
+    $priority = 10, $includes = array(), $ignore_duplicate = FALSE) {
 
 
   $user = user_load($uid);
   $user = user_load($uid);
 
 

+ 1 - 1
tripal/includes/TripalJob.inc

@@ -113,7 +113,7 @@ class TripalJob {
       $details['includes'] = array();
       $details['includes'] = array();
     }
     }
     if (!array_key_exists('ignore_duplicate', $details)) {
     if (!array_key_exists('ignore_duplicate', $details)) {
-      $details['ignore_duplicate'] = TRUE;
+      $details['ignore_duplicate'] = FALSE;
     }
     }
 
 
     // Make sure the arguments are correct.
     // Make sure the arguments are correct.

+ 5 - 2
tripal/tripal.module

@@ -1053,17 +1053,20 @@ function tripal_cron() {
 
 
   // Add jobs to the Tripal queue for commong tasks.
   // Add jobs to the Tripal queue for commong tasks.
   $args = array();
   $args = array();
+  $includes = array();
 
 
   if (variable_get('tripal_admin_notification_creation_during_cron', TRUE)) {
   if (variable_get('tripal_admin_notification_creation_during_cron', TRUE)) {
     $modules = module_implements('tripal_cron_notification');
     $modules = module_implements('tripal_cron_notification');
     foreach ($modules as $module) {
     foreach ($modules as $module) {
       $function = $module . '_tripal_cron_notification';
       $function = $module . '_tripal_cron_notification';
-      tripal_add_job("Cron: Checking for '$module' notifications.", 'tripal', $function, $args, 1);
+      tripal_add_job("Cron: Checking for '$module' notifications.", 'tripal',
+        $function, $args, 1, $includes, TRUE);
     }
     }
   }
   }
 
 
   // Check for expired collections.
   // Check for expired collections.
-  tripal_add_job('Cron: Checking expired collections', 'tripal', 'tripal_expire_collections', $args, 1);
+  tripal_add_job('Cron: Checking expired collections', 'tripal',
+    'tripal_expire_collections', $args, 1, $includes, TRUE);
 }
 }
 
 
 /**
 /**