From: Reedy <reedy@wikimedia.org>
Date: Fri, 13 Apr 2018 11:32:55 +0000 (+0000)
Subject: Display PHP version in old version error messages
X-Git-Tag: 1.31.0-rc.0~85^2
X-Git-Url: http://git.cyclocoop.org/data/%27%20.%20mediabox_timestamp%28find_in_path%28%27javascript/%7B%24www_url%7Dadmin/compta/operations/%40%20%27info_etape_suivante_2%27%20=%3E%20%27You%20can%20move%20on%20to%20the%20next%20step.%27%2C%20%27info_exceptions_proxy%27%20=%3E%20%27Exceptions%20for%20the%20proxy%27%2C%20%27info_exportation_base%27%20=%3E%20%27export%20database%20to%20%40archive%40%27%2C-%27info_facilite_suivi_activite%27%20=%3E%20%27To%20simplify%20monitoring%20of%20the%20site/%27s%20editorial;-%20%20activities%2C%20SPIP%20can%20send%20rmail%20notifications%2C%20e.g.%20to%20an%20editors/%27.%28%24current%20%3E%202?a=commitdiff_plain;h=f5a196a356c9f5b9167b4e58b1563c98dbe0e89b;p=lhc%2Fweb%2Fwiklou.git

Display PHP version in old version error messages

Change-Id: I3a6135871de0fdc94fa3fe622c6534746035a209
---

diff --git a/includes/PHPVersionCheck.php b/includes/PHPVersionCheck.php
index 46452d9c82..37d46321c2 100644
--- a/includes/PHPVersionCheck.php
+++ b/includes/PHPVersionCheck.php
@@ -115,7 +115,8 @@ class PHPVersionCheck {
 				. "{$otherInfo['minSupported']}, you are using {$phpInfo['implementation']} "
 				. "{$phpInfo['version']}.";
 
-			$longText = "Error: You might be using an older {$phpInfo['implementation']} version. \n"
+			$longText = "Error: You might be using an older {$phpInfo['implementation']} version "
+				. "({$phpInfo['implementation']} {$phpInfo['version']}). \n"
 				. "MediaWiki $this->mwVersion needs {$phpInfo['implementation']}"
 				. " $minimumVersion or higher or {$otherInfo['implementation']} version "
 				. "{$otherInfo['minSupported']}.\n\nCheck if you have a"