From bdff8c070fe96bc46bfe2cfea083005d056a0996 Mon Sep 17 00:00:00 2001 From: Helen Foster Date: Mon, 27 Feb 2017 10:27:58 +0100 Subject: [PATCH 1/2] MDL-58064 lang: Merge English strings from the en_fix language pack --- lang/en/install.php | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/lang/en/install.php b/lang/en/install.php index 5386298593477..9e460dc6c4fb7 100644 --- a/lang/en/install.php +++ b/lang/en/install.php @@ -217,10 +217,9 @@ $string['pgsqlextensionisnotpresentinphp'] = 'PHP has not been properly configured with the PGSQL extension so that it can communicate with PostgreSQL. Please check your php.ini file or recompile PHP.'; $string['phpextension'] = '{$a} PHP extension'; $string['phpversion'] = 'PHP version'; -$string['phpversionhelp'] = '

Moodle requires a PHP version of at least 4.3.0 or 5.1.0 (5.0.x has a number of known problems).

-

You are currently running version {$a}

-

You must upgrade PHP or move to a host with a newer version of PHP!
-(In case of 5.0.x you could also downgrade to 4.4.x version)

'; +$string['phpversionhelp'] = '

Moodle requires a PHP version of at least 5.4.4 (7.0.x has some engine limitations).

+

You are currently running version {$a}.

+

You must upgrade PHP or move to a host with a newer version of PHP.

'; $string['releasenoteslink'] = 'For information about this version of Moodle, please see the release notes at {$a}'; $string['safemode'] = 'Safe mode'; $string['safemodeerror'] = 'Moodle may have trouble with safe mode on'; From fe785db8db37f240def9560683379bbf66a1678c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Mudr=C3=A1k?= Date: Tue, 7 Mar 2017 12:56:28 +0100 Subject: [PATCH 2/2] MDL-58064 lang: Clarify the PHP 7.x limitations These are related to SQL*Server support only and affect all PHP 7 versions, not just 7.0.x. Credit goes to Eloy Lafuente for spotting this. --- lang/en/install.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lang/en/install.php b/lang/en/install.php index 9e460dc6c4fb7..bc5f1a185a8c6 100644 --- a/lang/en/install.php +++ b/lang/en/install.php @@ -217,7 +217,7 @@ $string['pgsqlextensionisnotpresentinphp'] = 'PHP has not been properly configured with the PGSQL extension so that it can communicate with PostgreSQL. Please check your php.ini file or recompile PHP.'; $string['phpextension'] = '{$a} PHP extension'; $string['phpversion'] = 'PHP version'; -$string['phpversionhelp'] = '

Moodle requires a PHP version of at least 5.4.4 (7.0.x has some engine limitations).

+$string['phpversionhelp'] = '

Moodle requires a PHP version of at least 5.4.4 (7.x has some engine limitations).

You are currently running version {$a}.

You must upgrade PHP or move to a host with a newer version of PHP.

'; $string['releasenoteslink'] = 'For information about this version of Moodle, please see the release notes at {$a}';