Merge "(bug 37072) - prevents infinite job loop"

diff --combined includes/job/JobQueue.php
index aa952a9,a3493b4..7a4f0ad
--- 1/includes/job/JobQueue.php
--- 2/includes/job/JobQueue.php
+++ b/includes/job/JobQueue.php
@@@ -113,7 -113,6 +113,6 @@@ abstract class Job 
         * @return Job or false if there's no jobs
         */
        static function pop( $offset = 0 ) {
-               global $wgJobTypesExcludedFromDefaultQueue;
                wfProfileIn( __METHOD__ );
  
                $dbr = wfGetDB( DB_SLAVE );
@@@ -124,12 -123,9 +123,9 @@@
                        NB: If random fetch previously was used, offset
                                will always be ahead of few entries
                */
-               $conditions = array();
-               if ( count( $wgJobTypesExcludedFromDefaultQueue ) != 0 ) {
-                       foreach ( $wgJobTypesExcludedFromDefaultQueue as $cmdType ) {
-                               $conditions[] = "job_cmd != " . $dbr->addQuotes( $cmdType );
-                       }
-               }
+ 
+               $conditions = self::defaultQueueConditions();
+ 
                $offset = intval( $offset );
                $options = array( 'ORDER BY' => 'job_id', 'USE INDEX' => 'PRIMARY' );
  
@@@ -199,7 -195,6 +195,7 @@@
                $title = Title::makeTitleSafe( $namespace, $dbkey );
  
                if ( is_null( $title ) ) {
 +                      wfProfileOut( __METHOD__ );
                        return false;
                }
  
@@@ -319,6 -314,26 +315,26 @@@
                wfIncrStats( 'job-insert', count( $jobs ) );
        }
  
+ 
+       /**
+        * SQL conditions to apply on most JobQueue queries
+        *
+        * Whenever we exclude jobs types from the default queue, we want to make
+        * sure that queries to the job queue actually ignore them.
+        *
+        * @return array SQL conditions suitable for Database:: methods
+        */
+       static function defaultQueueConditions( ) {
+               global $wgJobTypesExcludedFromDefaultQueue;
+               $conditions = array();
+               if ( count( $wgJobTypesExcludedFromDefaultQueue ) > 0 ) {
+                       foreach ( $wgJobTypesExcludedFromDefaultQueue as $cmdType ) {
+                               $conditions[] = "job_cmd != " . $dbr->addQuotes( $cmdType );
+                       }
+               }
+               return $conditions;
+       }
+ 
        /*-------------------------------------------------------------------------
         * Non-static functions
         *------------------------------------------------------------------------*/