From 092a022695d3f2d558007139534536b4d9cb4ef1 Mon Sep 17 00:00:00 2001 From: stronk7 Date: Thu, 5 Jan 2006 16:44:55 +0000 Subject: [PATCH] More uses for current_charset(). Merged from MOODLE_16_UTF8. Abandoning the branch. --- mod/resource/type/file/resource.class.php | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/mod/resource/type/file/resource.class.php b/mod/resource/type/file/resource.class.php index 1f0306e6be3..ec7ab152c6c 100644 --- a/mod/resource/type/file/resource.class.php +++ b/mod/resource/type/file/resource.class.php @@ -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 "\n"; echo "\n"; echo '';