From 986d3ef2c13aeaf8d172e89c30c2c2f93d9f1b55 Mon Sep 17 00:00:00 2001 From: Brad Jorsch Date: Mon, 5 May 2014 10:23:30 -0400 Subject: [PATCH] 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 --- includes/api/ApiQuerySiteinfo.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/includes/api/ApiQuerySiteinfo.php b/includes/api/ApiQuerySiteinfo.php index b7796eee73..b0e9bd227e 100644 --- a/includes/api/ApiQuerySiteinfo.php +++ b/includes/api/ApiQuerySiteinfo.php @@ -567,7 +567,10 @@ class ApiQuerySiteinfo extends ApiQueryBase { $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 ) { -- 2.20.1