Merge branch 'MDL-39491-workshop-media_23' of git://github.com/mudrd8mz/moodle into MOODLE_23_STABLE

This commit is contained in:
Dan Poltawski
2013-05-06 13:12:23 +01:00
+5 -4
View File
@@ -131,9 +131,10 @@ class mod_workshop_renderer extends plugin_renderer_base {
$o .= $this->output->container_end(); // end of header
$content = format_text($submission->content, $submission->contentformat, array('overflowdiv'=>true));
$content = file_rewrite_pluginfile_urls($content, 'pluginfile.php', $this->page->context->id,
$content = file_rewrite_pluginfile_urls($submission->content, 'pluginfile.php', $this->page->context->id,
'mod_workshop', 'submission_content', $submission->id);
$content = format_text($content, $submission->contentformat, array('overflowdiv'=>true));
$o .= $this->output->container($content, 'content');
$o .= $this->helper_submission_attachments($submission->id, 'html');
@@ -222,9 +223,9 @@ class mod_workshop_renderer extends plugin_renderer_base {
$o .= $this->output->heading(format_string($example->title), 3, 'title');
$o .= $this->output->container_end(); // end of header
$content = format_text($example->content, $example->contentformat, array('overflowdiv'=>true));
$content = file_rewrite_pluginfile_urls($content, 'pluginfile.php', $this->page->context->id,
$content = file_rewrite_pluginfile_urls($example->content, 'pluginfile.php', $this->page->context->id,
'mod_workshop', 'submission_content', $example->id);
$content = format_text($content, $example->contentformat, array('overflowdiv'=>true));
$o .= $this->output->container($content, 'content');
$o .= $this->helper_submission_attachments($example->id, 'html');