From 683c8259eada36ecd8b4f51d27a29037ff5ca4af Mon Sep 17 00:00:00 2001 From: Charles Fulton Date: Mon, 28 Nov 2011 18:02:10 -0800 Subject: [PATCH] MDL-24235 bennu: remove dependency on mbstring from library --- lib/bennu/iCalendar_rfc2445.php | 8 ++++---- lib/bennu/readme_moodle.txt | 1 + 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/lib/bennu/iCalendar_rfc2445.php b/lib/bennu/iCalendar_rfc2445.php index f6376dd7a6f..a84f370a5c2 100644 --- a/lib/bennu/iCalendar_rfc2445.php +++ b/lib/bennu/iCalendar_rfc2445.php @@ -56,7 +56,7 @@ define('RFC2445_TYPE_UTC_OFFSET', 13); function rfc2445_fold($string) { - if(mb_strlen($string, 'utf-8') <= RFC2445_FOLDED_LINE_LENGTH) { + if(textlib::strlen($string, 'utf-8') <= RFC2445_FOLDED_LINE_LENGTH) { return $string; } @@ -66,15 +66,15 @@ function rfc2445_fold($string) { $len_count=0; //multi-byte string, get the correct length - $section_len = mb_strlen($string, 'utf-8'); + $section_len = textlib::strlen($string, 'utf-8'); while($len_count<$section_len) { //get the current portion of the line - $section = mb_substr($string, ($i * RFC2445_FOLDED_LINE_LENGTH), (RFC2445_FOLDED_LINE_LENGTH), 'utf-8'); + $section = textlib::substr($string, ($i * RFC2445_FOLDED_LINE_LENGTH), (RFC2445_FOLDED_LINE_LENGTH), 'utf-8'); //increment the length we've processed by the length of the new portion - $len_count += mb_strlen($section, 'utf-8'); + $len_count += textlib::strlen($section, 'utf-8'); /* Add the portion to the return value, terminating with CRLF.HTAB As per RFC 2445, CRLF.HTAB will be replaced by the processor of the diff --git a/lib/bennu/readme_moodle.txt b/lib/bennu/readme_moodle.txt index 9b1db6033df..1c6154b12ee 100644 --- a/lib/bennu/readme_moodle.txt +++ b/lib/bennu/readme_moodle.txt @@ -2,3 +2,4 @@ Description of Bennu library import - customised library by author, this version modifications: 1/ removed ereg functions deprecated as of php 5.3 (18 Nov 2009) +2/ replaced mbstring functions with moodle textlib (28 Nov 2011) \ No newline at end of file