From 9604c55869b0879f944215eda992570820b55ec8 Mon Sep 17 00:00:00 2001 From: Kunal Mehta Date: Sun, 24 Jun 2018 23:55:43 +0300 Subject: [PATCH 1/1] GitInfo: Don't try shelling out if it's disabled Bug: T198037 Change-Id: I364f9bc0e78439474101f4b2a171805c91f50a72 (cherry picked from commit d503ac7c9433a36358b1db27c6365167ea869832) --- RELEASE-NOTES-1.31 | 1 + includes/GitInfo.php | 1 + 2 files changed, 2 insertions(+) diff --git a/RELEASE-NOTES-1.31 b/RELEASE-NOTES-1.31 index f64c8fadcd..818308a658 100644 --- a/RELEASE-NOTES-1.31 +++ b/RELEASE-NOTES-1.31 @@ -11,6 +11,7 @@ This is a security and maintenance release of the MediaWiki 1.31 branch. * Special:BotPasswords now requires reauthentication. * (T191608, T187638) Add 'logid' parameter to Special:Log. * (T193829) Indicate when a Bot Password needs reset. +* (T198037) GitInfo: Don't try shelling out if it's disabled. == MediaWiki 1.31 == diff --git a/includes/GitInfo.php b/includes/GitInfo.php index 6270b27fdd..363d7b8050 100644 --- a/includes/GitInfo.php +++ b/includes/GitInfo.php @@ -227,6 +227,7 @@ class GitInfo { $date = false; if ( is_file( $wgGitBin ) && is_executable( $wgGitBin ) && + !Shell::isDisabled() && $this->getHead() !== false ) { $cmd = [ -- 2.20.1