Changeset 42022 for trunk/src/wp-includes/Text/Diff/Engine/native.php

Timestamp:

10/25/2017 09:55:39 AM (7 years ago)

Author:

johnbillion

Message:

External Libraries: Revert [41633]. This causes warnings when editing and viewing certain revisions.

See #41526

File:

• trunk/src/wp-includes/Text/Diff/Engine/native.php (modified) (8 diffs)

trunk/src/wp-includes/Text/Diff/Engine/native.php

@@ -19 +19 @@
  * code was written by him, and is used/adapted with his permission.
  *
- * Copyright 2004-2017 Horde LLC (http://www.horde.org/)
+ * Copyright 2004-2010 The Horde Project (http://www.horde.org/)
  *
  * See the enclosed file COPYING for license information (LGPL). If you did
- * not receive this file, see http://www.horde.org/licenses/lgpl21.
+ * not receive this file, see http://opensource.org/licenses/lgpl-license.php.
  *
  * @author  Geoffrey T. Dairiki <dairiki@dairiki.org>
@@ -190 +190 @@
                 }
                 $matches = $ymatches[$line];
-                foreach ($matches as $y) {
+                reset($matches);
+                while (list(, $y) = each($matches)) {
                     if (empty($this->in_seq[$y])) {
                         $k = $this->_lcsPos($y);
@@ -196 +197 @@
                         $ymids[$k] = $ymids[$k - 1];
                         break;
-                    } elseif ($y > $this->seq[$k - 1]) {
+                    }
+                }
+                while (list(, $y) = each($matches)) {
+                    if ($y > $this->seq[$k - 1]) {
                         assert($y <= $this->seq[$k]);
+                        /* Optimization: this is a common case: next match is
+                         * just replacing previous match. */
                         $this->in_seq[$this->seq[$k]] = false;
                         $this->seq[$k] = $y;
                         $this->in_seq[$y] = 1;
+                    } elseif (empty($this->in_seq[$y])) {
+                        $k = $this->_lcsPos($y);
+                        assert($k > 0);
+                        $ymids[$k] = $ymids[$k - 1];
                     }
                 }
@@ -321 +331 @@
         $j = 0;
 
-        assert(count($lines) == count($changed));
+        assert('count($lines) == count($changed)');
         $len = count($lines);
         $other_len = count($other_changed);
@@ -342 +352 @@
 
             while ($i < $len && ! $changed[$i]) {
-                assert($j < $other_len && ! $other_changed[$j]);
+                assert('$j < $other_len && ! $other_changed[$j]');
                 $i++; $j++;
                 while ($j < $other_len && $other_changed[$j]) {
@@ -374 +384 @@
                         $start--;
                     }
-                    assert($j > 0);
+                    assert('$j > 0');
                     while ($other_changed[--$j]) {
                         continue;
                     }
-                    assert($j >= 0 && !$other_changed[$j]);
+                    assert('$j >= 0 && !$other_changed[$j]');
                 }
 
@@ -399 +409 @@
                     }
 
-                    assert($j < $other_len && ! $other_changed[$j]);
+                    assert('$j < $other_len && ! $other_changed[$j]');
                     $j++;
                     if ($j < $other_len && $other_changed[$j]) {
@@ -415 +425 @@
                 $changed[--$start] = 1;
                 $changed[--$i] = 0;
-                assert($j > 0);
+                assert('$j > 0');
                 while ($other_changed[--$j]) {
                     continue;
                 }
-                assert($j >= 0 && !$other_changed[$j]);
+                assert('$j >= 0 && !$other_changed[$j]');
             }
         }