Indefero

Indefero Commit Details


Date:2011-10-08 19:13:49 (13 years 6 months ago)
Author:Thomas Keller
Branch:develop, feature.diff-whitespace, feature.wiki-default-page, release-1.2, release-1.3
Commit:4fb15ccb7d4d212003241de70b7535ea77a59831
Parents: 234b70845c015b6b4b590f29b26c175543efff82
Message:6abd0b6f made problems in reviews, need to be reworked anyways in a few.
Changes:

File differences

src/IDF/Diff.php
245245
246246
247247
248
248
249249
250250
251251
......
361361
362362
363363
364
364
365365
366366
367367
     */␊
    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);␊
    }␊
            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];␊

Archive Download the corresponding diff file

Page rendered in 0.15187s using 13 queries.