mirror of
https://github.com/moodle/moodle.git
synced 2025-04-13 12:32:08 +02:00
Merge branch 'MDL-47995-master' of git://github.com/lameze/moodle
This commit is contained in:
commit
0eee70506e
@ -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
|
||||
|
Loading…
x
Reference in New Issue
Block a user