diff --git a/course/tests/externallib_test.php b/course/tests/externallib_test.php
index c153e6984eb..bc6560d4d8d 100644
--- a/course/tests/externallib_test.php
+++ b/course/tests/externallib_test.php
@@ -958,7 +958,6 @@ class core_course_externallib_testcase extends externallib_advanced_testcase {
         foreach ($sections[2]['modules'] as $module) {
             if ($module['id'] == $urlcm->id and $module['modname'] == 'url') {
                 $this->assertContains('width=100,height=100', $module['onclick']);
-                $this->assertContains('moodle.org', $module['customdata']);
                 $testexecuted = $testexecuted + 1;
             }
         }
diff --git a/mod/url/lib.php b/mod/url/lib.php
index 2229bd0cba3..23d11a0f4a7 100644
--- a/mod/url/lib.php
+++ b/mod/url/lib.php
@@ -212,7 +212,7 @@ function url_get_coursemodule_info($coursemodule) {
     require_once("$CFG->dirroot/mod/url/locallib.php");
 
     if (!$url = $DB->get_record('url', array('id'=>$coursemodule->instance),
-            'id, name, course, display, displayoptions, externalurl, parameters, intro, introformat')) {
+            'id, name, display, displayoptions, externalurl, parameters, intro, introformat')) {
         return NULL;
     }
 
@@ -243,9 +243,6 @@ function url_get_coursemodule_info($coursemodule) {
         $info->content = format_module_intro('url', $url, $coursemodule->id, false);
     }
 
-    $course = get_course($url->course); // Get cached course.
-    $info->customdata = array('fullurl' => str_replace('&', '&', url_get_full_url($url, $coursemodule, $course)));
-
     return $info;
 }
 
diff --git a/mod/url/locallib.php b/mod/url/locallib.php
index 7d9bba291cf..128db020749 100644
--- a/mod/url/locallib.php
+++ b/mod/url/locallib.php
@@ -460,18 +460,18 @@ function url_get_variable_values($url, $cm, $course, $config) {
 
     $values = array (
         'courseid'        => $course->id,
-        'coursefullname'  => format_string($course->fullname),
+        'coursefullname'  => format_string($course->fullname, true, array('context' => $coursecontext)),
         'courseshortname' => format_string($course->shortname, true, array('context' => $coursecontext)),
         'courseidnumber'  => $course->idnumber,
         'coursesummary'   => $course->summary,
         'courseformat'    => $course->format,
         'lang'            => current_language(),
-        'sitename'        => format_string($site->fullname),
+        'sitename'        => format_string($site->fullname, true, array('context' => $coursecontext)),
         'serverurl'       => $CFG->wwwroot,
         'currenttime'     => time(),
         'urlinstance'     => $url->id,
         'urlcmid'         => $cm->id,
-        'urlname'         => format_string($url->name),
+        'urlname'         => format_string($url->name, true, array('context' => $coursecontext)),
         'urlidnumber'     => $cm->idnumber,
     );