fixed encoding of page title of framed resources; merged from MOODLE_15_STABLE

This commit is contained in:
skodak 2005-11-04 10:00:28 +00:00
parent 082215e68e
commit 9c5afdf214

View File

@ -348,10 +348,15 @@ function display() {
$frameset = optional_param( 'frameset','' );
if (empty($frameset) and !$embedded and !$inpopup and ($resource->options == "frame")) {
if (!empty($CFG->unicode)) {
$encoding = 'utf-8';
} else {
$encoding = get_string('thischarset');
}
echo "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Frameset//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd\">\n";
echo "<html dir=\"ltr\">\n";
echo '<head>';
echo '<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />';
echo '<meta http-equiv="content-type" content="text/html; charset='.$encoding.'" />';
echo "<title>{$course->shortname}: ".strip_tags(format_string($resource->name,true))."</title></head>\n";
echo "<frameset rows=\"$CFG->resource_framesize,*\">";
echo "<frame src=\"view.php?id={$cm->id}&amp;type={$resource->type}&amp;frameset=top\" />";