moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-05 08:56:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'MDL-70711-M311' of git://github.com/kordan/moodle into MOODLE_311_STABLE

Browse source
This commit is contained in:
Eloy Lafuente (stronk7) 2021-02-03 13:06:20 +01:00
commit e912f3bb7a
2 changed files with 6 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

17
lib/pear/HTML/QuickForm.php
View file

@ -266,21 +266,8 @@ class HTML_QuickForm extends HTML_Common {
$attributes = array('action'=>$action, 'method'=>$method, 'name'=>$formName, 'id'=>$formName) + $target;
$this->updateAttributes($attributes);
if (!$trackSubmit || isset($_REQUEST['_qf__' . $formName])) {
if (1 == get_magic_quotes_gpc()) {
$this->_submitValues = ('get' == $method? $_GET: $_POST); // we already eliminated magic quotes in moodle setup.php
foreach ($_FILES as $keyFirst => $valFirst) {
foreach ($valFirst as $keySecond => $valSecond) {
if ('name' == $keySecond) {
$this->_submitFiles[$keyFirst][$keySecond] = $valSecond; // we already eliminated magic quotes in moodle setup.php
} else {
$this->_submitFiles[$keyFirst][$keySecond] = $valSecond;
}
}
}
} else {
$this->_submitValues = 'get' == $method? $_GET: $_POST;
$this->_submitFiles = $_FILES;
}
$this->_submitValues = 'get' == $method? $_GET: $_POST;
$this->_submitFiles = $_FILES;
$this->_flagSubmitted = count($this->_submitValues) > 0 || count($this->_submitFiles) > 0;
}
if ($trackSubmit) {

6
lib/pear/README_MOODLE.txt
View file

@ -21,11 +21,13 @@ MDL-52826 - Remove onsubmit events pointing to the global validation functions a
MDL-50484 - _getPersistantData() returns id with _persistant prefixed to element id.
MDL-55123 - corrected call to non-static functions in HTML_QuickForm to be PHP7.1-compliant
MDL-60281 - replaced deprecated create_function() with lambda functions for PHP7.2 compatibility
MDL-70711 - removed unnecessary if-else conditional block in HTML_QuickForm as the given
condition always evaluates to false due to the deprecated get_magic_quotes_gpc()
which always returns false
Pear
====
It was decided that we will not upgrade this library from upstream any more, see MDL-52465
It was decided that we will not upgrade this library from upstream any more, see MDL-52465
Changed constructors in classes PEAR and PEAR_ERROR to be __construct().
MDL-60281 - replaced deprecated function each() with foreach loop for PHP7.2 compatibility