Merged in fix for wrapping of multibyte languages

diff --git a/lib/weblib.php b/lib/weblib.php
index d927fd592589ca3587027a8c38023c09d9f9109b..957077d8f5da4b560fd426c9f29afabba23c0aef 100644 (file)
--- a/lib/weblib.php
+++ b/lib/weblib.php
@@ -203,6 +203,10 @@ function break_up_long_words($string, $maxsize=20, $cutchar=' ') {
 /// Given some normal text, this function will break up any
 /// long words to a given size, by inserting the given character
 
+    if (in_array(current_language(), array('ja', 'zh_cn', 'zh_tw', 'zh_tw_utf8'))) {  // Multibyte languages
+        return $string;
+    }
+
     $output = '';
     $length = strlen($string);
     $wordlength = 0;