Commit c2a0ce47 authored by Eloy Lafuente's avatar Eloy Lafuente
Browse files

Merge branch 'MDL-47995-28' of git://github.com/lameze/moodle into MOODLE_28_STABLE

parents 31aa2496 127b75e1
......@@ -137,7 +137,7 @@ function resource_display_frame($resource, $cm, $course, $file) {
$navurl = "$CFG->wwwroot/mod/resource/view.php?id=$cm->id&frameset=top";
$title = strip_tags(format_string($course->shortname.': '.$resource->name));
$framesize = $config->framesize;
$contentframetitle = format_string($resource->name);
$contentframetitle = s(format_string($resource->name));
$modulename = s(get_string('modulename','resource'));
$dir = get_string('thisdirection', 'langconfig');
......
......@@ -222,7 +222,7 @@ function url_display_frame($url, $cm, $course) {
$title = strip_tags($courseshortname.': '.format_string($url->name));
$framesize = $config->framesize;
$modulename = s(get_string('modulename','url'));
$contentframetitle = format_string($url->name);
$contentframetitle = s(format_string($url->name));
$dir = get_string('thisdirection', 'langconfig');
$extframe = <<<EOF
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment