makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-12 14:28:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

better regex

Browse source 
git-svn-id: file:///svn/phpbb/trunk@6694 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
David M 2006-11-29 01:33:14 +00:00
parent ae58794cbb
commit d417d53c0a
1 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
phpBB/includes/diff/diff.php
View file

@ -50,11 +50,8 @@ class diff
{ {
$diff_engine = &new diff_engine(); $diff_engine = &new diff_engine();
$match = array('#\r\n?#', "#([\n]+){2,}#u"); $from_content = preg_replace('#[\n\r]+#', "\n", $from_content);
$replace = array("\n", "\n"); $to_content = preg_replace('#[\n\r]+#', "\n", $to_content);
$from_content = preg_replace($match, $replace, $from_content);
$to_content = preg_replace($match, $replace, $to_content);
$this->_edits = call_user_func_array(array($diff_engine, 'diff'), array(explode("\n", $from_content), explode("\n", $to_content))); $this->_edits = call_user_func_array(array($diff_engine, 'diff'), array(explode("\n", $from_content), explode("\n", $to_content)));
} }