Merge branch 'MDL-36591-23' of git://github.com/damyon/moodle into MOODLE_23_STABLE

This commit is contained in:
Dan Poltawski
2012-12-11 13:57:11 +08:00
@@ -200,7 +200,12 @@ class assign_submission_onlinetext extends assign_submission_plugin {
$showviewlink = true;
if ($onlinetextsubmission) {
$text = format_text($onlinetextsubmission->onlinetext, $onlinetextsubmission->onlineformat, array('context'=>$this->assignment->get_context()));
$text = $this->assignment->render_editor_content(ASSIGNSUBMISSION_ONLINETEXT_FILEAREA,
$onlinetextsubmission->submission,
$this->get_type(),
'onlinetext',
'assignsubmission_onlinetext');
$shorttext = shorten_text($text, 140);
if ($text != $shorttext) {
return $shorttext . get_string('numwords', 'assignsubmission_onlinetext', count_words($text));