From 813ef678b412518ea14a19758b498e1190315724 Mon Sep 17 00:00:00 2001
From: Dominik Schilling <dominikschilling+git@gmail.com>
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: http://core.svn.wordpress.org/trunk@24363 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 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);
     }