From 84e4d32e379d60db8af58daf5ae38c8af61a6bc0 Mon Sep 17 00:00:00 2001
From: stronk7 <stronk7>
Date: Thu, 5 Jan 2006 16:46:19 +0000
Subject: [PATCH] More uses for current_charset()

Merged from MOODLE_16_UTF8. Abandoning the branch.
---
 mod/resource/type/ims/resource.class.php | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/mod/resource/type/ims/resource.class.php b/mod/resource/type/ims/resource.class.php
index 40e9692a5ea..910f8c9f4e7 100644
--- a/mod/resource/type/ims/resource.class.php
+++ b/mod/resource/type/ims/resource.class.php
@@ -369,11 +369,7 @@ class resource_ims extends resource_base {
         if (empty($frameset)) {
 
         /// Select encoding
-            if (!empty($CFG->unicode)) {
-                $encoding = 'utf-8';
-            } else {
-                $encoding = get_string('thischarset');
-            }
+            $encoding = current_charset();
 
         /// Select direction
             if (get_string('thisdirection') == 'rtl') {
@@ -441,11 +437,7 @@ class resource_ims extends resource_base {
             }
 
         /// Select encoding
-            if (!empty($CFG->unicode)) {
-                $encoding = 'utf-8';
-            } else {
-                $encoding = get_string('thischarset');
-            }
+            $encoding = current_charset();
 
         /// Select direction
             if (get_string('thisdirection') == 'rtl') {