--- diff/diff.module Thu Sep 09 15:33:03 2010 +++ diff/diff.module Thu Dec 23 20:19:32 2010 @@ -265,11 +265,32 @@ $a = is_array($a) ? $a : explode("\n", $a); $b = is_array($b) ? $b : explode("\n", $b); - module_load_include('php', 'diff', 'DiffEngine'); - $formatter = new DrupalDiffFormatter(); - $formatter->show_header = $show_header; - $diff = new Diff($a, $b); - return $formatter->format($diff); + //module_load_include('php', 'diff', 'DiffEngine'); + //$formatter = new DrupalDiffFormatter(); + //$formatter->show_header = $show_header; + //$diff = new Diff($a, $b); + //return $formatter->format($diff); + + include_once 'Text/Diff.php'; + include_once 'Text/Diff/Renderer.php'; + include_once 'Text/Diff/Renderer/inline.php'; + //include_once 'inline.php'; // except let's use our own inline.php so we can keep CR's + + + assert_options(ASSERT_ACTIVE, 0); // turn off assertion testing that gets done in native.php PEAR class + $diff = &new Text_Diff('auto', array($a, $b)); + $renderer = &new Text_Diff_Renderer_inline(); + $rend1= $renderer->render($diff); + $rend1 = htmlspecialchars_decode($rend1); + $rendarr2= array(array(array( + 'data' => t($rend1), + 'class' => 'diff-content', + 'colspan' => 4 + ))); + + +return $rendarr2; + } /**