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

Merge branch 'MDL-63303-master-fix' of git://github.com/andrewnicols/moodle

Browse Source
This commit is contained in:
Eloy Lafuente (stronk7)
2018-11-15 11:01:24 +01:00
parent ac6cdcea06 5e47224a62
commit 6a7ee95231
1 changed files with 19 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
message/externallib.php
+19 -23
View File
@@ -1106,30 +1106,26 @@ class core_message_external extends external_api {
'requirescontact' => new external_value(PARAM_BOOL, 'If the user requires to be contacts'),
];
if ($includecontactrequests) {
$result['contactrequests'] = new external_multiple_structure(
new external_single_structure(
[
'id' => new external_value(PARAM_INT, 'The id of the message'),
'userid' => new external_value(PARAM_INT, 'The id of the user who sent the message'),
'requesteduserid' => new external_value(PARAM_RAW, 'The text of the message'),
'timecreated' => new external_value(PARAM_INT, 'The timecreated timestamp for the message'),
]
), 'The contact requests', VALUE_OPTIONAL
);
}
$result['contactrequests'] = new external_multiple_structure(
new external_single_structure(
[
'id' => new external_value(PARAM_INT, 'The id of the message'),
'userid' => new external_value(PARAM_INT, 'The id of the user who sent the message'),
'requesteduserid' => new external_value(PARAM_RAW, 'The text of the message'),
'timecreated' => new external_value(PARAM_INT, 'The timecreated timestamp for the message'),
]
), 'The contact requests', VALUE_OPTIONAL
);
if ($includeconversations) {
$result['conversations'] = new external_multiple_structure(new external_single_structure(
array(
'id' => new external_value(PARAM_INT, 'Conversations id'),
'type' => new external_value(PARAM_INT, 'Conversation type: private or public'),
'name' => new external_value(PARAM_TEXT, 'Multilang compatible conversation name'. VALUE_OPTIONAL),
'timecreated' => new external_value(PARAM_INT, 'The timecreated timestamp for the conversation'),
), 'information about conversation', VALUE_OPTIONAL),
'Conversations between users', VALUE_OPTIONAL
);
}
$result['conversations'] = new external_multiple_structure(new external_single_structure(
array(
'id' => new external_value(PARAM_INT, 'Conversations id'),
'type' => new external_value(PARAM_INT, 'Conversation type: private or public'),
'name' => new external_value(PARAM_TEXT, 'Multilang compatible conversation name'. VALUE_OPTIONAL),
'timecreated' => new external_value(PARAM_INT, 'The timecreated timestamp for the conversation'),
), 'information about conversation', VALUE_OPTIONAL),
'Conversations between users', VALUE_OPTIONAL
);
return new external_single_structure(
$result