MDL-39491 Fix order of Workshop submission text processing
authorDavid Mudrák <david@moodle.com>
Fri, 3 May 2013 09:43:03 +0000 (11:43 +0200)
committerDavid Mudrák <david@moodle.com>
Fri, 3 May 2013 09:56:44 +0000 (11:56 +0200)
The order of format_text() and file_rewrite_pluginfile_urls() is
important to make filters work correctly.

mod/workshop/renderer.php

index 74a69cc..a4311a8 100644 (file)
@@ -132,9 +132,9 @@ 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));
         if (!empty($content)) {
             if (!empty($CFG->enableplagiarism)) {
                 require_once($CFG->libdir.'/plagiarismlib.php');
@@ -232,9 +232,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');