diff options
| author | David M <davidmj@users.sourceforge.net> | 2006-11-29 01:33:14 +0000 |
|---|---|---|
| committer | David M <davidmj@users.sourceforge.net> | 2006-11-29 01:33:14 +0000 |
| commit | d417d53c0aceb79f18df31a372f78f9dc44519c7 (patch) | |
| tree | aaa239a2170a0e4612ea44c94c2a29e491fb5d66 /phpBB/includes/diff | |
| parent | ae58794cbb6f77d1a1ebbe17fee703c9660577df (diff) | |
| download | forums-d417d53c0aceb79f18df31a372f78f9dc44519c7.tar forums-d417d53c0aceb79f18df31a372f78f9dc44519c7.tar.gz forums-d417d53c0aceb79f18df31a372f78f9dc44519c7.tar.bz2 forums-d417d53c0aceb79f18df31a372f78f9dc44519c7.tar.xz forums-d417d53c0aceb79f18df31a372f78f9dc44519c7.zip | |
better regex
git-svn-id: file:///svn/phpbb/trunk@6694 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/diff')
| -rw-r--r-- | phpBB/includes/diff/diff.php | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/phpBB/includes/diff/diff.php b/phpBB/includes/diff/diff.php index 59124ae7ef..430ae0f522 100644 --- a/phpBB/includes/diff/diff.php +++ b/phpBB/includes/diff/diff.php @@ -50,11 +50,8 @@ class diff { $diff_engine = &new diff_engine(); - $match = array('#\r\n?#', "#([\n]+){2,}#u"); - $replace = array("\n", "\n"); - - $from_content = preg_replace($match, $replace, $from_content); - $to_content = preg_replace($match, $replace, $to_content); + $from_content = preg_replace('#[\n\r]+#', "\n", $from_content); + $to_content = preg_replace('#[\n\r]+#', "\n", $to_content); $this->_edits = call_user_func_array(array($diff_engine, 'diff'), array(explode("\n", $from_content), explode("\n", $to_content))); } |