Merge branch 'mdl26_MDL-29004_wiki-fix-images-in-printer-friendly-view' of https...

diff --git a/mod/wiki/pagelib.php b/mod/wiki/pagelib.php
index 7a5f9fc..90b258f 100644 (file)
--- a/mod/wiki/pagelib.php
+++ b/mod/wiki/pagelib.php
@@ -2203,8 +2203,14 @@ class page_wiki_prettyview extends page_wiki {
 
         $content = wiki_parse_content($version->contentformat, $version->content, array('printable' => true, 'swid' => $this->subwiki->id, 'pageid' => $this->page->id, 'pretty_print' => true));
 
+        $html = $content['parsed_text'];
+        $id = $this->subwiki->wikiid;
+        if ($cm = get_coursemodule_from_instance("wiki", $id)) {
+            $context = context_module::instance($cm->id);
+            $html = file_rewrite_pluginfile_urls($html, 'pluginfile.php', $context->id, 'mod_wiki', 'attachments', $this->subwiki->id);
+        }
         echo '<div id="wiki_printable_content">';
-        echo format_text($content['parsed_text'], FORMAT_HTML);
+        echo format_text($html, FORMAT_HTML);
         echo '</div>';
     }
 }