Merge branch 'MDL-71390-39' of git://github.com/marinaglancy/moodle into MOODLE_39_STABLE

This commit is contained in:
Sara Arjona
2021-05-06 08:05:26 +02:00
3 changed files with 28 additions and 0 deletions
+2
View File
@@ -3527,6 +3527,8 @@
<ON_CHECK message="sixtyfourbitswarning" />
</FEEDBACK>
</CUSTOM_CHECK>
<CUSTOM_CHECK file="lib/upgradelib.php" function="check_max_input_vars" level="optional">
</CUSTOM_CHECK>
</CUSTOM_CHECKS>
</MOODLE>
</COMPATIBILITY_MATRIX>
+2
View File
@@ -1149,6 +1149,8 @@ $string['sessionhandling'] = 'Session handling';
$string['sessiontimeout'] = 'Timeout';
$string['settingdependenton'] = 'This setting may be hidden, based on the value of <strong>{$a}</strong>.';
$string['settingfileuploads'] = 'File uploading is required for normal operation, please enable it in PHP configuration.';
$string['settingmaxinputvars'] = 'PHP setting max_input_vars is recommended to be at least 5000.';
$string['settingmaxinputvarsrequired'] = 'PHP setting max_input_vars must be at least 5000.';
$string['settingmemorylimit'] = 'Insufficient memory detected, please set higher memory limit in PHP settings.';
$string['settingsafemode'] = 'Moodle is not fully compatible with safe mode, please ask server administrator to turn it off. Running Moodle under safe mode is not supported, please expect various problems if you do so.';
$string['setupsearchengine'] = 'Setup search engine';
+24
View File
@@ -2612,3 +2612,27 @@ function check_libcurl_version(environment_results $result) {
return null;
}
/**
* Environment check for the php setting max_input_vars
*
* @param environment_results $result
* @return environment_results|null
*/
function check_max_input_vars(environment_results $result) {
$max = (int)ini_get('max_input_vars');
if ($max < 5000) {
$result->setInfo('max_input_vars');
$result->setStatus(false);
if (PHP_VERSION_ID >= 80000) {
// For PHP8 this check is required.
$result->setLevel('required');
$result->setFeedbackStr('settingmaxinputvarsrequired');
} else {
// For PHP7 this check is optional (recommended).
$result->setFeedbackStr('settingmaxinputvars');
}
return $result;
}
return null;
}