Merge "Remove "Misc" tab from Special:Preferences"

[lhc/web/wiklou.git] / includes / job / JobQueueGroup.php

diff --git a/includes/job/JobQueueGroup.php b/includes/job/JobQueueGroup.php
index 85f99b7..e483e05 100644 (file)
--- a/includes/job/JobQueueGroup.php
+++ b/includes/job/JobQueueGroup.php
@@ -310,9 +310,13 @@ class JobQueueGroup {
                                } elseif ( !isset( $lastRuns[$type][$task] )
                                        || $lastRuns[$type][$task] < ( time() - $definition['period'] ) )
                                {
-                                       if ( call_user_func( $definition['callback'] ) !== null ) {
-                                               $tasksRun[$type][$task] = time();
-                                               ++$count;
+                                       try {
+                                               if ( call_user_func( $definition['callback'] ) !== null ) {
+                                                       $tasksRun[$type][$task] = time();
+                                                       ++$count;
+                                               }
+                                       } catch ( JobQueueError $e ) {
+                                               wfDebugLog( 'exception', $e->getLogMessage() );
                                        }
                                }
                        }