jenkins-bot has submitted this change and it was merged. Change subject: API: Check return value from $gitInfo->getHeadCommitDate() ......................................................................
API: Check return value from $gitInfo->getHeadCommitDate() action=query&meta=siteinfo&siprop=extensions calls $gitInfo->getHeadCommitDate() to attempt to find the commit date, but does not check whether that function returned false before using the value. This resulted in displaying the current date for "vcs-date" when the function failed. Bug: 64821 Change-Id: Ic39a74abe5160b3b7fbfb7c15323328d6b317560 (cherry picked from commit 986d3ef2c13aeaf8d172e89c30c2c2f93d9f1b55) --- M includes/api/ApiQuerySiteinfo.php 1 file changed, 4 insertions(+), 1 deletion(-) Approvals: MarkAHershberger: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/api/ApiQuerySiteinfo.php b/includes/api/ApiQuerySiteinfo.php index b7796ee..b0e9bd2 100644 --- a/includes/api/ApiQuerySiteinfo.php +++ b/includes/api/ApiQuerySiteinfo.php @@ -567,7 +567,10 @@ $ret['vcs-system'] = 'git'; $ret['vcs-version'] = $vcsVersion; $ret['vcs-url'] = $gitInfo->getHeadViewUrl(); - $ret['vcs-date'] = wfTimestamp( TS_ISO_8601, $gitInfo->getHeadCommitDate() ); + $vcsDate = $gitInfo->getHeadCommitDate(); + if ( $vcsDate !== false ) { + $ret['vcs-date'] = wfTimestamp( TS_ISO_8601, $vcsDate ); + } } else { $svnInfo = SpecialVersion::getSvnInfo( $extensionPath ); if ( $svnInfo !== false ) { -- To view, visit https://gerrit.wikimedia.org/r/131631 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic39a74abe5160b3b7fbfb7c15323328d6b317560 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: REL1_23 Gerrit-Owner: MarkAHershberger <m...@nichework.com> Gerrit-Reviewer: Anomie <bjor...@wikimedia.org> Gerrit-Reviewer: MarkAHershberger <m...@nichework.com> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits