From 4fb15ccb7d4d212003241de70b7535ea77a59831 Mon Sep 17 00:00:00 2001 From: Thomas Keller Date: Sun, 9 Oct 2011 02:13:49 +0200 Subject: [PATCH] 6abd0b6f made problems in reviews, need to be reworked anyways in a few. --- src/IDF/Diff.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/IDF/Diff.php b/src/IDF/Diff.php index 5a66886..8ab78b1 100644 --- a/src/IDF/Diff.php +++ b/src/IDF/Diff.php @@ -245,7 +245,7 @@ class IDF_Diff */ public function fileCompare($orig, $chunks, $filename, $context=10) { - $orig_lines = self::splitIntoLines($orig); + $orig_lines = IDF_FileUtil::splitIntoLines($orig); $new_chunks = $this->mergeChunks($orig_lines, $chunks, $context); return $this->renderCompared($new_chunks, $filename); } @@ -361,7 +361,7 @@ class IDF_Diff foreach ($chunk as $line) { $line1 = ' '; $line2 = ' '; - $line[2] = (strlen($line[2])) ? self::padLine(Pluf_esc($line[2])) : ' '; + $line[2] = (strlen($line[2])) ? IDF_FileUtil::emphasizeControlCharacters(Pluf_esc($line[2])) : ' '; if ($line[0] and $line[1]) { $class = 'diff-c'; $line1 = $line2 = $line[2];