diff options
| author | Andreas Gohr <andi@splitbrain.org> | 2011-01-23 19:48:31 +0100 |
|---|---|---|
| committer | Andreas Gohr <andi@splitbrain.org> | 2011-01-23 19:48:31 +0100 |
| commit | ec79b3c98747e3777df661f0183be518a1cf7fef (patch) | |
| tree | 60ec0a60297686fd452783170bef3a463855b32b /inc/DifferenceEngine.php | |
| parent | 33c72f1de00e99df631e7267ab3fc142b61269f5 (diff) | |
| parent | 5b718e235e1d9b39e7db0f8641945353ea7fa8ab (diff) | |
| download | rpg-ec79b3c98747e3777df661f0183be518a1cf7fef.tar.gz rpg-ec79b3c98747e3777df661f0183be518a1cf7fef.tar.bz2 | |
Merge branch 'master' of https://github.com/danny0838/dokuwiki into danny0838-master
Diffstat (limited to 'inc/DifferenceEngine.php')
| -rw-r--r-- | inc/DifferenceEngine.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/inc/DifferenceEngine.php b/inc/DifferenceEngine.php index dd096a55a..1e1d4c3a3 100644 --- a/inc/DifferenceEngine.php +++ b/inc/DifferenceEngine.php @@ -932,7 +932,7 @@ class InlineWordLevelDiff extends MappedDiff { } function _split($lines) { - if (!preg_match_all('/ ( [^\S\n]+ | [0-9_A-Za-z\x80-\xff]+ | . ) (?: (?!< \n) [^\S\n])? /xs', + if (!preg_match_all('/ ( [^\S\n]+ | [0-9_A-Za-z\x80-\xff]+ | . ) (?: (?!< \n) [^\S\n])? /xsu', implode("\n", $lines), $m)) { return array(array(''), array('')); } |