Declare Text_Diff::trimNewlines() as static. Upstream is not back compat. props aaroncampbell. fixes #24372.
git-svn-id: http://core.svn.wordpress.org/trunk@24363 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
parent
4a067e8949
commit
813ef678b4
|
@ -205,7 +205,7 @@ class Text_Diff {
|
||||||
* @param string $line The line to trim.
|
* @param string $line The line to trim.
|
||||||
* @param integer $key The index of the line in the array. Not used.
|
* @param integer $key The index of the line in the array. Not used.
|
||||||
*/
|
*/
|
||||||
function trimNewlines(&$line, $key)
|
static function trimNewlines(&$line, $key)
|
||||||
{
|
{
|
||||||
$line = str_replace(array("\n", "\r"), '', $line);
|
$line = str_replace(array("\n", "\r"), '', $line);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue