summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDanny Lin <danny0838@pchome.com.tw>2011-01-23 16:50:04 +0800
committerDanny Lin <danny0838@pchome.com.tw>2011-01-23 16:50:04 +0800
commitc5982caa2e7089b1ace770dab8da1de167fa2f94 (patch)
treecebec6621277dacca7b135cfa244a7fd6649fa61
parent3e1ca056e645515478add4931738a5f476e1bf3e (diff)
downloadrpg-c5982caa2e7089b1ace770dab8da1de167fa2f94.tar.gz
rpg-c5982caa2e7089b1ace770dab8da1de167fa2f94.tar.bz2
InlineWordLevelDiff regex should be /xsu - FS#2142
-rw-r--r--inc/DifferenceEngine.php2
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(''));
}