Merge branch 'MDL-66262' of git://github.com/stronk7/moodle

This commit is contained in:
Jun Pataleta 2019-09-26 11:34:45 +08:00
commit 8dc1505374
3 changed files with 14 additions and 0 deletions

View File

@ -2451,6 +2451,7 @@
<VENDOR name="oracle" version="11.2" />
</DATABASE>
<PHP version="7.0.0" level="required">
<RESTRICT function="restrict_php_version_74" message="unsupportedphpversion74" />
</PHP>
<PCREUNICODE level="optional">
<FEEDBACK>
@ -2632,6 +2633,7 @@
<VENDOR name="oracle" version="11.2" />
</DATABASE>
<PHP version="7.1.0" level="required">
<RESTRICT function="restrict_php_version_74" message="unsupportedphpversion74" />
</PHP>
<PCREUNICODE level="optional">
<FEEDBACK>

View File

@ -1318,6 +1318,7 @@ $string['unsupportedphpversion7'] = 'PHP version 7 is not supported.';
$string['unsupportedphpversion71'] = 'PHP version 7.1 is not supported.';
$string['unsupportedphpversion72'] = 'PHP version 7.2 is not supported.';
$string['unsupportedphpversion73'] = 'PHP version 7.3 is not supported.';
$string['unsupportedphpversion74'] = 'PHP version 7.4 is not supported.';
$string['unsuspenduser'] = 'Activate user account';
$string['updateaccounts'] = 'Update existing accounts';
$string['updatecomponent'] = 'Update component';

View File

@ -1628,3 +1628,14 @@ function restrict_php_version_72(&$result) {
function restrict_php_version_73(&$result) {
return restrict_php_version($result, '7.3');
}
/**
* Check if the current PHP version is greater than or equal to
* PHP version 7.4.
*
* @param object $result an environment_results instance
* @return bool result of version check
*/
function restrict_php_version_74(&$result) {
return restrict_php_version($result, '7.4');
}