diff options
| author | jenkins-bot <jenkins-bot@gerrit.wikimedia.org> | 2021-05-06 02:24:12 +0000 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@wikimedia.org> | 2021-05-06 02:24:12 +0000 |
| commit | 3af81b2938f6206f532bd4eaf532aadb49f10629 (patch) | |
| tree | 58d8718b9bfa4b52c54da20a823ff749569239c7 /includes | |
| parent | f808e7dc4ac6f0426f835b9e52481d89e1dd5b80 (diff) | |
| parent | 7430e278c6b21d3cdcc608c3b8cb12ee3d4c04ef (diff) | |
| download | mediawikicore-3af81b2938f6206f532bd4eaf532aadb49f10629.tar.gz mediawikicore-3af81b2938f6206f532bd4eaf532aadb49f10629.zip | |
Merge "EditPage::getExpectedParentRevision(): guard against null edittime"
Diffstat (limited to 'includes')
| -rw-r--r-- | includes/EditPage.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/includes/EditPage.php b/includes/EditPage.php index 73dc4d8b3657..e9adf4dc831e 100644 --- a/includes/EditPage.php +++ b/includes/EditPage.php @@ -272,7 +272,7 @@ class EditPage implements IEditObject { */ private $nosummary = false; - /** @var string + /** @var string|null * Timestamp of the latest revision of the page when editing was initiated * on the client. */ @@ -2594,7 +2594,7 @@ class EditPage implements IEditObject { $this->editRevId, RevisionStore::READ_LATEST ); - } else { + } elseif ( $this->edittime ) { $revRecord = $this->revisionStore->getRevisionByTimestamp( $this->getTitle(), $this->edittime, |