do_update_diff(): Simplify. Beautify XHTML

diff --git a/lib/diff.php b/lib/diff.php
index c44cefc..28ca604 100644 (file)
--- a/lib/diff.php
+++ b/lib/diff.php
@@ -2,7 +2,7 @@
 // PukiWiki - Yet another WikiWikiWeb clone.
 // $Id: diff.php,v 1.10 2011/01/25 15:01:01 henoheno Exp $
 // Copyright (C)
-//   2003-2005 PukiWiki Developers Team
+//   2003-2005, 2007 PukiWiki Developers Team
 //   2001-2002 Originally written by yu-ji
 // License: GPL v2 or (at your option) any later version
 //
@@ -47,8 +47,8 @@ function do_update_diff($pagestr, $poststr, $original)
 
        if (PKWK_DIFF_SHOW_CONFLICT_DETAIL) {
                global $do_update_diff_table;
-
-               $do_update_diff_table = <<<EOD
+               $table = array();
+               $table[] = <<<EOD
 <p>l : between backup data and stored page data.<br />
  r : between backup data and your post data.</p>
 <table class="style_table">
@@ -60,29 +60,32 @@ function do_update_diff($pagestr, $poststr, $original)
 EOD;
                $tags = array('th', 'th', 'td');
                foreach ($arr as $_obj) {
-                       $do_update_diff_table .= '<tr>';
+                       $table[] = ' <tr>';
                        $params = array($_obj->get('left'), $_obj->get('right'), $_obj->text());
-                       foreach ($params as $key=>$text) {
-                               $text = htmlsc($text);
-                               if (trim($text) == '') $text = '&nbsp;';
-                               $do_update_diff_table .= '<' . $tags[$key] .
-                                       ' class="style_' . $tags[$key] . '">' . $text .
+                       foreach ($params as $key => $text) {
+                               $text = htmlsc(rtrim($text));
+                               if (empty($text)) $text = '&nbsp;';
+                               $table[] = 
+                                       '  <' . $tags[$key] . ' class="style_' . $tags[$key] . '">' .
+                                       $text .
                                        '</' . $tags[$key] . '>';
                        }
-                       $do_update_diff_table .= '</tr>' . "\n";
+                       $table[] = ' </tr>';
                }
-               $do_update_diff_table .= '</table>' . "\n";
+               $table[] =  '</table>';
+
+               $do_update_diff_table = implode("\n", $table) . "\n";
+               unset($table);
        }
 
-       $body = '';
+       $body = array();
        foreach ($arr as $_obj) {
-               if ($_obj->get('left') != '-' && $_obj->get('right') != '-')
-                       $body .= $_obj->text();
+               if ($_obj->get('left') != '-' && $_obj->get('right') != '-') {
+                       $body[] = $_obj->text();
+               }
        }
 
-       $auto = 1;
-
-       return array(rtrim($body) . "\n", $auto);
+       return array(rtrim(implode('', $body)) . "\n", 1);
 }