Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Made job factory() callers use Title::makeTitle

Browse source 
* The titles are not from user input and this simplifies the code

Change-Id: I067049cca5661b387076f0c28bc0b71d22162a0f
This commit is contained in:
Aaron Schulz 2015-04-13 14:21:30 -07:00
parent 2ce9fee021
commit f7f49dfb00
2 changed files with 5 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
includes/jobqueue/JobQueueDB.php
View file

@ -314,12 +314,7 @@ class JobQueueDB extends JobQueue {
}
JobQueue::incrStats( 'job-pop', $this->type, 1, $this->wiki );
// Get the job object from the row...
$title = Title::makeTitleSafe( $row->job_namespace, $row->job_title );
if ( !$title ) {
$dbw->delete( 'job', array( 'job_id' => $row->job_id ), __METHOD__ );
wfDebug( "Row has invalid title '{$row->job_title}'.\n" );
continue; // try again
}
$title = Title::makeTitle( $row->job_namespace, $row->job_title );
$job = Job::factory( $row->job_cmd, $title,
self::extractBlob( $row->job_params ), $row->job_id );
$job->metadata['id'] = $row->job_id;

12
includes/jobqueue/JobQueueRedis.php
View file

@ -631,15 +631,11 @@ LUA;
* @return Job|bool
*/
protected function getJobFromFields( array $fields ) {
$title = Title::makeTitleSafe( $fields['namespace'], $fields['title'] );
if ( $title ) {
$job = Job::factory( $fields['type'], $title, $fields['params'] );
$job->metadata['uuid'] = $fields['uuid'];
$title = Title::makeTitle( $fields['namespace'], $fields['title'] );
$job = Job::factory( $fields['type'], $title, $fields['params'] );
$job->metadata['uuid'] = $fields['uuid'];
return $job;
}
return false;
return $job;
}
/**