L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MDL-76583 core: Update uses of external_* classes

Browse Source
This commit is contained in:
Andrew Nicols
2023-01-19 07:34:09 +08:00
parent 3e1920966c
commit a3cc26f8bb
382 changed files with 4067 additions and 4443 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/classes/grading_external.php
+14 -7
View File
@@ -23,9 +23,16 @@
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
use core_external\external_api;
use core_external\external_format_value;
use core_external\external_function_parameters;
use core_external\external_multiple_structure;
use core_external\external_single_structure;
use core_external\external_value;
use core_external\external_warnings;
defined('MOODLE_INTERNAL') || die;
require_once("$CFG->libdir/externallib.php");
require_once("$CFG->dirroot/grade/grading/lib.php");
/**
@@ -153,7 +160,7 @@ class core_grading_external extends external_api {
$definition['usermodified'] = $def->usermodified;
$definition['timecopied'] = $def->timecopied;
// Format the description text field.
$formattedtext = external_format_text($definition['description'],
$formattedtext = \core_external\util::format_text($definition['description'],
$definition['descriptionformat'],
$context->id,
$componentname,
@@ -180,14 +187,14 @@ class core_grading_external extends external_api {
}
/**
* Recursively processes all elements in an array and runs external_format_text()on
* Recursively processes all elements in an array and runs \core_external\util::format_text()on
* all elements which have a text field and associated format field with a key name
* that ends with the text 'format'. The modified array is returned.
* @param array $items the array to be processed
* @param int $contextid
* @param string $componentname
* @param int $itemid
* @see external_format_text in lib/externallib.php
* @see \core_external\util::format_text()
* @return array the input array with all fields formatted
*/
private static function format_text($items, $contextid, $componentname, $itemid) {
@@ -199,9 +206,9 @@ class core_grading_external extends external_api {
}
foreach ($formatkeys as $formatkey) {
$descriptionkey = substr($formatkey, 0, -6);
$formattedtext = external_format_text($items[$descriptionkey],
$formattedtext = \core_external\util::format_text($items[$descriptionkey],
$items[$formatkey],
$contextid,
context::instance_by_id($contextid),
$componentname,
'description',
$itemid);
@@ -367,7 +374,7 @@ class core_grading_external extends external_api {
$instance['feedback'] = $activeinstance->get_data('feedback');
$instance['feedbackformat'] = $activeinstance->get_data('feedbackformat');
// Format the feedback text field.
$formattedtext = external_format_text($activeinstance->get_data('feedback'),
$formattedtext = \core_external\util::format_text($activeinstance->get_data('feedback'),
$activeinstance->get_data('feedbackformat'),
$context->id,
$area->component,