From c0bd060a58c159a1d64287317dbde13229a99d81 Mon Sep 17 00:00:00 2001 From: stronk7 Date: Sat, 10 Jun 2006 10:40:16 +0000 Subject: [PATCH] Change the moodle_strtolower() function to use textlib services. Also, mark it as deprecated, code should use text services directly. Partially, bug 5777. It continues under investigation. (http://moodle.org/bugs/bug.php?op=show&bugid=5777) Merged from MOODLE_16_STABLE --- lib/moodlelib.php | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/lib/moodlelib.php b/lib/moodlelib.php index 69a5e0b2643..46e74f2a917 100644 --- a/lib/moodlelib.php +++ b/lib/moodlelib.php @@ -5975,17 +5975,18 @@ function moodle_setlocale($locale='') { * @param string $encoding The encoding on the string. * @return string * @todo Add examples of calling this function with/without encoding types + * @deprecated Use textlib->strtolower($text, current_charset()) instead. */ function moodle_strtolower ($string, $encoding='') { - if (function_exists('mb_strtolower')) { - if($encoding===''){ - return mb_strtolower($string); //use multibyte support with default encoding - } else { - return mb_strtolower($string, $encoding); //use given encoding - } - } else { - return strtolower($string); // use common function what rely on current locale setting + + //If not specified, get the current encoding + if (empty($encoding)) { + $encoding = current_charset(); } + //Use text services + $textlib = textlib_get_instance(); + + return $textlib->strtolower($string, $encoding); } /**