WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

See #41526

Built from https://develop.svn.wordpress.org/trunk@42022


git-svn-id: http://core.svn.wordpress.org/trunk@41856 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
John Blackbourn 2017-10-25 09:56:53 +00:00
parent 6794fd18ef
commit 7fc62bbd4f
2 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
wp-includes/Text/Diff/Engine/native.php
View File

@ -18,10 +18,10 @@
* Geoffrey T. Dairiki <dairiki@dairiki.org>. The original PHP version of this * Geoffrey T. Dairiki <dairiki@dairiki.org>. The original PHP version of this
* code was written by him, and is used/adapted with his permission. * 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 * 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> * @author Geoffrey T. Dairiki <dairiki@dairiki.org>
* @package Text_Diff * @package Text_Diff
@ -189,17 +189,27 @@ class Text_Diff_Engine_native {
continue; continue;
} }
$matches = $ymatches[$line]; $matches = $ymatches[$line];
foreach ($matches as $y) { reset($matches);
while (list(, $y) = each($matches)) {
if (empty($this->in_seq[$y])) { if (empty($this->in_seq[$y])) {
$k = $this->_lcsPos($y); $k = $this->_lcsPos($y);
assert($k > 0); assert($k > 0);
$ymids[$k] = $ymids[$k - 1]; $ymids[$k] = $ymids[$k - 1];
break; break;
} elseif ($y > $this->seq[$k - 1]) { }
}
while (list(, $y) = each($matches)) {
if ($y > $this->seq[$k - 1]) {
assert($y <= $this->seq[$k]); 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->in_seq[$this->seq[$k]] = false;
$this->seq[$k] = $y; $this->seq[$k] = $y;
$this->in_seq[$y] = 1; $this->in_seq[$y] = 1;
} elseif (empty($this->in_seq[$y])) {
$k = $this->_lcsPos($y);
assert($k > 0);
$ymids[$k] = $ymids[$k - 1];
} }
} }
} }
@ -320,7 +330,7 @@ class Text_Diff_Engine_native {
$i = 0; $i = 0;
$j = 0; $j = 0;
assert(count($lines) == count($changed)); assert('count($lines) == count($changed)');
$len = count($lines); $len = count($lines);
$other_len = count($other_changed); $other_len = count($other_changed);
@ -341,7 +351,7 @@ class Text_Diff_Engine_native {
} }
while ($i < $len && ! $changed[$i]) { while ($i < $len && ! $changed[$i]) {
assert($j < $other_len && ! $other_changed[$j]); assert('$j < $other_len && ! $other_changed[$j]');
$i++; $j++; $i++; $j++;
while ($j < $other_len && $other_changed[$j]) { while ($j < $other_len && $other_changed[$j]) {
$j++; $j++;
@ -373,11 +383,11 @@ class Text_Diff_Engine_native {
while ($start > 0 && $changed[$start - 1]) { while ($start > 0 && $changed[$start - 1]) {
$start--; $start--;
} }
assert($j > 0); assert('$j > 0');
while ($other_changed[--$j]) { while ($other_changed[--$j]) {
continue; continue;
} }
assert($j >= 0 && !$other_changed[$j]); assert('$j >= 0 && !$other_changed[$j]');
} }
/* Set CORRESPONDING to the end of the changed run, at the /* Set CORRESPONDING to the end of the changed run, at the
@ -398,7 +408,7 @@ class Text_Diff_Engine_native {
$i++; $i++;
} }
assert($j < $other_len && ! $other_changed[$j]); assert('$j < $other_len && ! $other_changed[$j]');
$j++; $j++;
if ($j < $other_len && $other_changed[$j]) { if ($j < $other_len && $other_changed[$j]) {
$corresponding = $i; $corresponding = $i;
@ -414,11 +424,11 @@ class Text_Diff_Engine_native {
while ($corresponding < $i) { while ($corresponding < $i) {
$changed[--$start] = 1; $changed[--$start] = 1;
$changed[--$i] = 0; $changed[--$i] = 0;
assert($j > 0); assert('$j > 0');
while ($other_changed[--$j]) { while ($other_changed[--$j]) {
continue; continue;
} }
assert($j >= 0 && !$other_changed[$j]); assert('$j >= 0 && !$other_changed[$j]');
} }
} }
} }

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.9-beta4-42021'; $wp_version = '4.9-beta4-42022';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.