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

Merge branch 'MDL-77081' of https://github.com/paulholden/moodle

Browse source
This commit is contained in:
Andrew Nicols 2023-01-31 21:43:01 +08:00
commit 58afba6d82
3 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/formslib.php
View file

@ -3195,7 +3195,7 @@ class MoodleQuickForm_Renderer extends HTML_QuickForm_Renderer_Tableless{
$html = str_replace('{groupname}', 'data-groupname="'.$group->getName().'"', $html); $html = str_replace('{groupname}', 'data-groupname="'.$group->getName().'"', $html);
$html = str_replace('{typeclass}', 'fgroup', $html); $html = str_replace('{typeclass}', 'fgroup', $html);
$html = str_replace('{type}', 'group', $html); $html = str_replace('{type}', 'group', $html);
$html = str_replace('{class}', $group->getAttribute('class'), $html); $html = str_replace('{class}', $group->getAttribute('class') ?? '', $html);
$emptylabel = ''; $emptylabel = '';
if ($group->getLabel() == '') { if ($group->getLabel() == '') {
$emptylabel = 'femptylabel'; $emptylabel = 'femptylabel';

2
lib/pear/HTML/QuickForm/textarea.php
View file

@ -199,7 +199,7 @@ class HTML_QuickForm_textarea extends HTML_QuickForm_element
return $this->_getTabs() . return $this->_getTabs() .
'<textarea' . $this->_getAttrString($this->_attributes) . '>' . '<textarea' . $this->_getAttrString($this->_attributes) . '>' .
// because we wrap the form later we don't want the text indented // because we wrap the form later we don't want the text indented
preg_replace("/(\r\n|\n|\r)/", '&#010;', htmlspecialchars($this->_value)) . preg_replace("/(\r\n|\n|\r)/", '&#010;', htmlspecialchars($this->_value ?? '')) .
'</textarea>'; '</textarea>';
} }
} //end func toHtml } //end func toHtml

3
lib/pear/readme_moodle.txt
View file

@ -32,7 +32,8 @@ MDL-70457 - PHP 7.4 curly brackets string access fix.
MDL-71126 - Quiz: Manual grading page size preference can get stuck at 0 MDL-71126 - Quiz: Manual grading page size preference can get stuck at 0
Including in this change: Including in this change:
- New positiveint regex rule to check if the value is a positive integer - New positiveint regex rule to check if the value is a positive integer
MDL-76102 - PHP 8.1 passing null to a non-nullable argument of a built-in function is deprecated MDL-76102 / MDL-77081
PHP 8.1 passing null to a non-nullable argument of a built-in function is deprecated
Pear Pear
==== ====