Index: wp-includes/Text/Diff.php
===================================================================
--- wp-includes/Text/Diff.php	(revision 24362)
+++ wp-includes/Text/Diff.php	(working copy)
@@ -205,7 +205,7 @@
      * @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);
     }