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

Merge branch 'MDL-70876_311' of https://github.com/stronk7/moodle into MOODLE_311_STABLE

Browse source
This commit is contained in:
Jun Pataleta 2021-03-02 16:02:15 +08:00
commit c9d57344b0
3 changed files with 4 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

3
backup/util/settings/tests/settings_test.php
View file

@ -504,10 +504,9 @@ class mock_course_backup_setting extends course_backup_setting {
* @param string $errstr
* @param string $errfile
* @param int $errline
* @param array $errcontext
* @return null
*/
function backup_setting_error_handler($errno, $errstr, $errfile, $errline, $errcontext) {
function backup_setting_error_handler($errno, $errstr, $errfile, $errline) {
if ($errno !== E_RECOVERABLE_ERROR) {
// Currently we only want to deal with type hinting errors
return false;