MDL-24235 bennu: remove dependency on mbstring from library

tombola · Mar 2, 2012 · be90ed2 · be90ed2
1 parent 5bbf3cb
commit be90ed2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/lib/bennu/iCalendar_rfc2445.php b/lib/bennu/iCalendar_rfc2445.php
@@ -56,7 +56,7 @@
 
 
 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
@@ -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)
Original file line number	Diff line number	Diff line change
Expand Up		@@ -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)