Merge branch 'master' of git://github.com/petrkalivoda/horde into pet…

…rkalivoda-master
horde · Jun 11, 2014 · 36f670e · 36f670e
2 parents 531dd6e + 66c12e2
commit 36f670e
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/framework/Text_Diff/lib/Horde/Text/Diff/Renderer/Inline.php b/framework/Text_Diff/lib/Horde/Text/Diff/Renderer/Inline.php
@@ -146,8 +146,8 @@ protected function _changed($orig, $final)
 
         if ($this->_split_characters) {
             $diff = new Horde_Text_Diff('native',
-                                  array(preg_split('//', $text1),
-                                        preg_split('//', $text2)));
+                                  array(preg_split('//u', $text1),
+                                        preg_split('//u', $text2)));
         } else {
             /* We want to split on word boundaries, but we need to preserve
              * whitespace as well. Therefore we split on words, but include