More uses for current_charset().

Merged from MOODLE_16_UTF8. Abandoning the branch.
This commit is contained in:
stronk7 2006-01-05 16:44:55 +00:00
parent 8867a3bb88
commit 092a022695

View File

@ -348,11 +348,7 @@ 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');
}
$encoding = current_charset();
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>';