MDL-25336 fixed & in mod/url and fixed incomplete click url when embedding

diff --git a/mod/url/locallib.php b/mod/url/locallib.php
index da2b5a5..0e57a65 100644 (file)
--- a/mod/url/locallib.php
+++ b/mod/url/locallib.php
@@ -150,7 +150,7 @@ function url_display_frame($url, $cm, $course) {
     } else {
         $config = get_config('url');
         $context = get_context_instance(CONTEXT_MODULE, $cm->id);
-        $exteurl = s(url_get_full_url($url, $cm, $course, $config));
+        $exteurl = url_get_full_url($url, $cm, $course, $config);
         $navurl = "$CFG->wwwroot/mod/url/view.php?id=$cm->id&frameset=top";
         $title = strip_tags(format_string($course->shortname.': '.$url->name));
         $framesize = $config->framesize;
@@ -227,13 +227,13 @@ function url_print_workaround($url, $cm, $course) {
 function url_display_embed($url, $cm, $course) {
     global $CFG, $PAGE, $OUTPUT;
 
-    $link = html_writer::tag('a', $url->externalurl, array('href'=>$url->externalurl));
-    $clicktoopen = get_string('clicktoopen', 'url', $link);
-
     $mimetype = resourcelib_guess_url_mimetype($url->externalurl);
     $fullurl  = url_get_full_url($url, $cm, $course);
     $title    = $url->name;
 
+    $link = html_writer::tag('a', $fullurl, array('href'=>str_replace('&', '&', $fullurl)));
+    $clicktoopen = get_string('clicktoopen', 'url', $link);
+
     if (in_array($mimetype, array('image/gif','image/jpeg','image/png'))) {  // It's an image
         $code = resourcelib_embed_image($fullurl, $title);
 

diff --git a/mod/url/view.php b/mod/url/view.php
index 0876791..a18093a 100644 (file)
--- a/mod/url/view.php
+++ b/mod/url/view.php
@@ -59,7 +59,7 @@ if ($redirect) {
     // coming from course page or url index page,
     // the redirection is needed for completion tracking and logging
     $fullurl = url_get_full_url($url, $cm, $course);
-    redirect($fullurl);
+    redirect(str_replace('&', '&', $fullurl));
 }
 
 switch (url_get_final_display_type($url)) {