mirror of
https://github.com/phpbb/phpbb.git
synced 2025-07-27 04:18:55 +00:00
[ticket/16277] Adjust patch for the diff engine
PHPBB3-16277
This commit is contained in:
parent
80de9f6a68
commit
374dc92e8f
1 changed files with 2 additions and 0 deletions
|
@ -287,6 +287,7 @@ class diff_engine
|
||||||
reset($matches);
|
reset($matches);
|
||||||
while ($y = current($matches))
|
while ($y = current($matches))
|
||||||
{
|
{
|
||||||
|
next($matches);
|
||||||
if (empty($this->in_seq[$y]))
|
if (empty($this->in_seq[$y]))
|
||||||
{
|
{
|
||||||
$k = $this->_lcs_pos($y);
|
$k = $this->_lcs_pos($y);
|
||||||
|
@ -298,6 +299,7 @@ class diff_engine
|
||||||
// no reset() here
|
// no reset() here
|
||||||
while ($y = current($matches))
|
while ($y = current($matches))
|
||||||
{
|
{
|
||||||
|
next($matches);
|
||||||
if ($y > $this->seq[$k - 1])
|
if ($y > $this->seq[$k - 1])
|
||||||
{
|
{
|
||||||
// Optimization: this is a common case: next match is just replacing previous match.
|
// Optimization: this is a common case: next match is just replacing previous match.
|
||||||
|
|
Loading…
Add table
Reference in a new issue