vhad/wordpress-develop
1
0
Fork 0
mirror of https://github.com/gosticks/wordpress-develop.git synced 2026-04-08 14:44:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove deprecated pass-by-reference from the Text_Diff external library. Upstream is not back compat. see #24372.

Browse Source 
git-svn-id: https://develop.svn.wordpress.org/trunk@24362 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Andrew Nacin
2013-05-25 21:38:25 +00:00
parent bc47ae4f6d
commit ec0d4f2f75
5 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
wp-includes/Text/Diff/Engine/string.php
View File

@@ -99,7 +99,7 @@ class Text_Diff_Engine_string {
do {
$diff1[] = substr($diff[$i], 1);
} while (++$i < $end && substr($diff[$i], 0, 1) == ' ');
$edits[] = &new Text_Diff_Op_copy($diff1);
$edits[] = new Text_Diff_Op_copy($diff1);
break;
case '+':
@@ -107,7 +107,7 @@ class Text_Diff_Engine_string {
do {
$diff1[] = substr($diff[$i], 1);
} while (++$i < $end && substr($diff[$i], 0, 1) == '+');
$edits[] = &new Text_Diff_Op_add($diff1);
$edits[] = new Text_Diff_Op_add($diff1);
break;
case '-':
@@ -121,9 +121,9 @@ class Text_Diff_Engine_string {
$diff2[] = substr($diff[$i++], 1);
}
if (count($diff2) == 0) {
$edits[] = &new Text_Diff_Op_delete($diff1);
$edits[] = new Text_Diff_Op_delete($diff1);
} else {
$edits[] = &new Text_Diff_Op_change($diff1, $diff2);
$edits[] = new Text_Diff_Op_change($diff1, $diff2);
}
break;
@@ -189,7 +189,7 @@ class Text_Diff_Engine_string {
$array[] = substr($diff[$j++], 2);
}
if (count($array) > 0) {
$edits[] = &new Text_Diff_Op_copy($array);
$edits[] = new Text_Diff_Op_copy($array);
}
if ($i < $max_i) {
@@ -203,21 +203,21 @@ class Text_Diff_Engine_string {
$diff2[] = substr($diff[$j++], 2);
}
} while (++$i < $max_i && substr($diff[$i], 0, 1) == '!');
$edits[] = &new Text_Diff_Op_change($diff1, $diff2);
$edits[] = new Text_Diff_Op_change($diff1, $diff2);
break;
case '+':
do {
$diff1[] = substr($diff[$i], 2);
} while (++$i < $max_i && substr($diff[$i], 0, 1) == '+');
$edits[] = &new Text_Diff_Op_add($diff1);
$edits[] = new Text_Diff_Op_add($diff1);
break;
case '-':
do {
$diff1[] = substr($diff[$i], 2);
} while (++$i < $max_i && substr($diff[$i], 0, 1) == '-');
$edits[] = &new Text_Diff_Op_delete($diff1);
$edits[] = new Text_Diff_Op_delete($diff1);
break;
}
}
@@ -229,14 +229,14 @@ class Text_Diff_Engine_string {
do {
$diff2[] = substr($diff[$j++], 2);
} while ($j < $max_j && substr($diff[$j], 0, 1) == '+');
$edits[] = &new Text_Diff_Op_add($diff2);
$edits[] = new Text_Diff_Op_add($diff2);
break;
case '-':
do {
$diff2[] = substr($diff[$j++], 2);
} while ($j < $max_j && substr($diff[$j], 0, 1) == '-');
$edits[] = &new Text_Diff_Op_delete($diff2);
$edits[] = new Text_Diff_Op_delete($diff2);
break;
}
}