aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/diff/engine.php
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2020-01-01 16:35:42 +0100
committerMarc Alexander <admin@m-a-styles.de>2020-01-01 16:35:42 +0100
commit7ae750214661214984e7944ef86698087ac7d2bd (patch)
tree9b7071dcc1a7e8662510aae431cf6e261e5c0bd9 /phpBB/includes/diff/engine.php
parent7a294b5fcd7e38beb52bf3f899b483da476c0c59 (diff)
parent374dc92e8f5659f4035bee05a902e773fede1177 (diff)
downloadforums-7ae750214661214984e7944ef86698087ac7d2bd.tar
forums-7ae750214661214984e7944ef86698087ac7d2bd.tar.gz
forums-7ae750214661214984e7944ef86698087ac7d2bd.tar.bz2
forums-7ae750214661214984e7944ef86698087ac7d2bd.tar.xz
forums-7ae750214661214984e7944ef86698087ac7d2bd.zip
Merge pull request #5798 from rxu/ticket/16277
[ticket/16277] Move from each() function
Diffstat (limited to 'phpBB/includes/diff/engine.php')
-rw-r--r--phpBB/includes/diff/engine.php6
1 files changed, 4 insertions, 2 deletions
diff --git a/phpBB/includes/diff/engine.php b/phpBB/includes/diff/engine.php
index 757fdadde9..0d73db02da 100644
--- a/phpBB/includes/diff/engine.php
+++ b/phpBB/includes/diff/engine.php
@@ -285,8 +285,9 @@ class diff_engine
$matches = $ymatches[$line];
reset($matches);
- while (list(, $y) = each($matches))
+ while ($y = current($matches))
{
+ next($matches);
if (empty($this->in_seq[$y]))
{
$k = $this->_lcs_pos($y);
@@ -296,8 +297,9 @@ class diff_engine
}
// no reset() here
- while (list(, $y) = each($matches))
+ while ($y = current($matches))
{
+ next($matches);
if ($y > $this->seq[$k - 1])
{
// Optimization: this is a common case: next match is just replacing previous match.