diff options
| author | Aaron Schulz <aschulz@wikimedia.org> | 2016-10-29 09:16:39 -0700 |
|---|---|---|
| committer | Aaron Schulz <aschulz@wikimedia.org> | 2016-10-29 20:47:03 +0000 |
| commit | 92b2319de6a19f36b8a06d0d8ee31a2b020c5091 (patch) | |
| tree | 95148fbbc4d72ab7c745ebedbe66f0d719cf36ae /includes/MergeHistory.php | |
| parent | 77d29bef9c46c2e5a0ed98bf2e505241a1dde075 (diff) | |
| download | mediawikicore-92b2319de6a19f36b8a06d0d8ee31a2b020c5091.tar.gz mediawikicore-92b2319de6a19f36b8a06d0d8ee31a2b020c5091.zip | |
Add missing Database::timestamp() calls
This was broken for Postgres installations
Change-Id: I0c1d442e3cf1d9a4d5359e7a8f8fd02a31d1ac65
Diffstat (limited to 'includes/MergeHistory.php')
| -rw-r--r-- | includes/MergeHistory.php | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/includes/MergeHistory.php b/includes/MergeHistory.php index f797fe355c7e..e57f88099ac6 100644 --- a/includes/MergeHistory.php +++ b/includes/MergeHistory.php @@ -90,7 +90,8 @@ class MergeHistory { 'revision', 'MAX(rev_timestamp)', [ - 'rev_timestamp <= ' . $this->dbw->timestamp( $mwTimestamp ), + 'rev_timestamp <= ' . + $this->dbw->addQuotes( $this->dbw->timestamp( $mwTimestamp ) ), 'rev_page' => $this->source->getArticleID() ], __METHOD__ @@ -118,7 +119,8 @@ class MergeHistory { $this->timestampLimit = $lasttimestamp; } - $this->timeWhere = "rev_timestamp <= {$this->dbw->timestamp( $timeInsert )}"; + $this->timeWhere = "rev_timestamp <= " . + $this->dbw->addQuotes( $this->dbw->timestamp( $timeInsert ) ); } catch ( TimestampException $ex ) { // The timestamp we got is screwed up and merge cannot continue // This should be detected by $this->isValidMerge() |