Permalink
Browse files

Merge branch 'MDL-39491-workshop-media_23' of git://github.com/mudrd8…

…mz/moodle into MOODLE_23_STABLE
  • Loading branch information...
2 parents b4eeee4 + b908e2f commit 100da2dcfb2c6e1bbeb7eb6ed1e59a79b7b43087 @danpoltawski danpoltawski committed May 6, 2013
Showing with 5 additions and 4 deletions.
  1. +5 −4 mod/workshop/renderer.php
@@ -131,9 +131,10 @@ protected function render_workshop_submission(workshop_submission $submission) {
$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 @@ protected function render_workshop_example_submission(workshop_example_submissio
$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');

0 comments on commit 100da2d

Please sign in to comment.