Merge branch 'MDL-55220-master' of git://github.com/jleyva/moodle

This commit is contained in:
Eloy Lafuente (stronk7) 2016-07-19 13:21:36 +02:00
commit 4feed61702

View File

@ -276,6 +276,7 @@ class mod_forum_external extends external_api {
$userpicture->size = 1; // Size f1.
$post->userpictureurl = $userpicture->get_url($PAGE)->out(false);
$post->subject = external_format_string($post->subject, $modcontext->id);
// Rewrite embedded images URLs.
list($post->message, $post->messageformat) =
external_format_text($post->message, $post->messageformat, $modcontext->id, 'mod_forum', 'post', $post->id);
@ -508,6 +509,8 @@ class mod_forum_external extends external_api {
$userpicture->size = 1; // Size f1.
$discussion->usermodifiedpictureurl = $userpicture->get_url($PAGE)->out(false);
$discussion->name = external_format_string($discussion->name, $modcontext->id);
$discussion->subject = external_format_string($discussion->subject, $modcontext->id);
// Rewrite embedded images URLs.
list($discussion->message, $discussion->messageformat) =
external_format_text($discussion->message, $discussion->messageformat,