L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Eloy Lafuente (stronk7)
2015-06-03 11:11:35 +02:00
parent 31aa2496d1 127b75e161
commit c2a0ce47db
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mod/resource/locallib.php
+1 -1
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";
$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');
mod/url/locallib.php
+1 -1
View File
@@ -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