From d8395ec80ccd02675bdc724b779e3206f0af9fdc Mon Sep 17 00:00:00 2001
From: "Dominik Schilling (ocean90)" <ocean90@git.wordpress.org>
Date: Sat, 25 May 2013 22:10:53 +0000
Subject: [PATCH] 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
---
 wp-includes/Text/Diff.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wp-includes/Text/Diff.php b/wp-includes/Text/Diff.php
index b7eae7daba..dc24b67f71 100644
--- a/wp-includes/Text/Diff.php
+++ b/wp-includes/Text/Diff.php
@@ -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);
     }