natalie/indefero
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

6abd0b6f made problems in reviews, need to be reworked anyways in a few.

Browse Source
This commit is contained in:
Thomas Keller 2011-10-09 02:13:49 +02:00
parent 234b70845c
commit 4fb15ccb7d
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/IDF/Diff.php
View File

@ -245,7 +245,7 @@ class IDF_Diff
*/ */
public function fileCompare($orig, $chunks, $filename, $context=10) 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); $new_chunks = $this->mergeChunks($orig_lines, $chunks, $context);
return $this->renderCompared($new_chunks, $filename); return $this->renderCompared($new_chunks, $filename);
} }
@ -361,7 +361,7 @@ class IDF_Diff
foreach ($chunk as $line) { foreach ($chunk as $line) {
$line1 = ' '; $line1 = ' ';
$line2 = ' '; $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]) { if ($line[0] and $line[1]) {
$class = 'diff-c'; $class = 'diff-c';
$line1 = $line2 = $line[2]; $line1 = $line2 = $line[2];