Declare Text_Diff::trimNewlines() as static. Upstream is not back compat. props aaroncampbell. fixes #24372.
git-svn-id: https://develop.svn.wordpress.org/trunk@24363 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
parent
ec0d4f2f75
commit
d8395ec80c
@ -205,7 +205,7 @@ class Text_Diff {
|
||||
* @param string $line The line to trim.
|
||||
* @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);
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user