moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-05 08:56:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'MDL-47995-master' of git://github.com/lameze/moodle

Browse source
This commit is contained in:
Eloy Lafuente (stronk7) 2015-06-03 11:10:41 +02:00
commit 0eee70506e
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
mod/resource/locallib.php
View file

@ -137,7 +137,7 @@ function resource_display_frame($resource, $cm, $course, $file) {
$navurl = "$CFG->wwwroot/mod/resource/view.php?id=$cm->id&frameset=top"; $navurl = "$CFG->wwwroot/mod/resource/view.php?id=$cm->id&frameset=top";
$title = strip_tags(format_string($course->shortname.': '.$resource->name)); $title = strip_tags(format_string($course->shortname.': '.$resource->name));
$framesize = $config->framesize; $framesize = $config->framesize;
$contentframetitle = format_string($resource->name); $contentframetitle = s(format_string($resource->name));
$modulename = s(get_string('modulename','resource')); $modulename = s(get_string('modulename','resource'));
$dir = get_string('thisdirection', 'langconfig'); $dir = get_string('thisdirection', 'langconfig');

2
mod/url/locallib.php
View file

@ -222,7 +222,7 @@ function url_display_frame($url, $cm, $course) {
$title = strip_tags($courseshortname.': '.format_string($url->name)); $title = strip_tags($courseshortname.': '.format_string($url->name));
$framesize = $config->framesize; $framesize = $config->framesize;
$modulename = s(get_string('modulename','url')); $modulename = s(get_string('modulename','url'));
$contentframetitle = format_string($url->name); $contentframetitle = s(format_string($url->name));
$dir = get_string('thisdirection', 'langconfig'); $dir = get_string('thisdirection', 'langconfig');
$extframe = <<<EOF $extframe = <<<EOF