MDL-18910 full support for module intro editor with embedded images

diff --git a/lib/filelib.php b/lib/filelib.php
index 911a85637440122317e261ae17f3f6a88218cd60..a61c41fc984747017f06067bed47601f3450da57 100644 (file)
--- a/lib/filelib.php
+++ b/lib/filelib.php
@@ -191,7 +191,11 @@ function file_rewrite_pluginfile_urls($text, $file, $contextid, $filearea, $item
         $file = $file . '?file=';
     }
 
-    $baseurl = "$CFG->wwwroot/$file/$contextid/$filearea/$itemid/";
+    $baseurl = "$CFG->wwwroot/$file/$contextid/$filearea/";
+
+    if ($itemid !== null) {
+        $baseurl .= "$itemid/";
+    }
 
     if ($forcehttps) {
         $baseurl = str_replace('http://', 'https://', $baseurl);

diff --git a/lib/weblib.php b/lib/weblib.php
index a386f27871b41485af9b1c27629f67388dc52ed0..823444afa54f7d6b2f1967608421507f66765c00 100644 (file)
--- a/lib/weblib.php
+++ b/lib/weblib.php
@@ -1563,7 +1563,7 @@ function format_module_intro($module, $activity, $cmid, $filter=true) {
     require_once("$CFG->libdir/filelib.php");
     $options = (object)array('noclean'=>true, 'para'=>false, 'filter'=>false);
     $context = get_context_instance(CONTEXT_MODULE, $cmid);
-    $intro = file_rewrite_pluginfile_urls($activity->intro, 'pluginfile.php', $context->id, $module.'_intro', 0);
+    $intro = file_rewrite_pluginfile_urls($activity->intro, 'pluginfile.php', $context->id, $module.'_intro', null);
     return trim(format_text($intro, $activity->introformat, $options));
 }
 

diff --git a/pluginfile.php b/pluginfile.php
index 4014e345eafd5b499ffa730b15a74559ec821055..dc7f278338e7258910e2b5808f8be3d754e0e512 100644 (file)
--- a/pluginfile.php
+++ b/pluginfile.php
@@ -239,7 +239,6 @@
                 send_file_not_found();
             }
             // all users may access it
-            $itemid = (int)array_shift($args);
             $relativepath = '/'.implode('/', $args);
             $fullpath = $context->id.$filearea.'0'.$relativepath;