dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Make showDiffPage() protected"
[lhc/web/wiklou.git]
/
includes
/
jobqueue
/
JobQueueDB.php
diff --git
a/includes/jobqueue/JobQueueDB.php
b/includes/jobqueue/JobQueueDB.php
index
08873cc
..
5e8399c
100644
(file)
--- a/
includes/jobqueue/JobQueueDB.php
+++ b/
includes/jobqueue/JobQueueDB.php
@@
-221,7
+221,7
@@
class JobQueueDB extends JobQueue {
}
$rowSet = array(); // (sha1 => job) map for jobs that are de-duplicated
}
$rowSet = array(); // (sha1 => job) map for jobs that are de-duplicated
- $rowList = array(); // list of jobs for jobs that are
are
not de-duplicated
+ $rowList = array(); // list of jobs for jobs that are not de-duplicated
foreach ( $jobs as $job ) {
$row = $this->insertFields( $job );
if ( $job->ignoreDuplicates() ) {
foreach ( $jobs as $job ) {
$row = $this->insertFields( $job );
if ( $job->ignoreDuplicates() ) {
@@
-556,7
+556,7
@@
class JobQueueDB extends JobQueue {
* @return void
*/
protected function doWaitForBackups() {
* @return void
*/
protected function doWaitForBackups() {
- wfWaitForSlaves();
+ wfWaitForSlaves(
false, $this->wiki, $this->cluster ?: false
);
}
/**
}
/**