diff options
| author | Dominik Dröscher <dhn2@users.sourceforge.net> | 2007-01-28 16:46:26 +0000 |
|---|---|---|
| committer | Dominik Dröscher <dhn2@users.sourceforge.net> | 2007-01-28 16:46:26 +0000 |
| commit | f0cc1229487adb1f4dccfdc26efdbfd7f4db199e (patch) | |
| tree | 59819f9ec8c1ead091a195a031d1c0145a1bbc8e /phpBB/includes/diff | |
| parent | 46bf79ec78906e2f36a8408a1edaf139ef6dd5b0 (diff) | |
| download | forums-f0cc1229487adb1f4dccfdc26efdbfd7f4db199e.tar forums-f0cc1229487adb1f4dccfdc26efdbfd7f4db199e.tar.gz forums-f0cc1229487adb1f4dccfdc26efdbfd7f4db199e.tar.bz2 forums-f0cc1229487adb1f4dccfdc26efdbfd7f4db199e.tar.xz forums-f0cc1229487adb1f4dccfdc26efdbfd7f4db199e.zip | |
First bunch of changes for #5712
git-svn-id: file:///svn/phpbb/trunk@6947 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/diff')
| -rw-r--r-- | phpBB/includes/diff/renderer.php | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/phpBB/includes/diff/renderer.php b/phpBB/includes/diff/renderer.php index 490450dd7b..ce9e8955aa 100644 --- a/phpBB/includes/diff/renderer.php +++ b/phpBB/includes/diff/renderer.php @@ -298,17 +298,17 @@ class diff_renderer_unified extends diff_renderer function _context($lines) { - return '<pre class="diff context">' . htmlspecialchars($this->_lines($lines, ' ')) . '</pre>'; + return '<pre class="diff context">' . htmlspecialchars($this->_lines($lines, ' ')) . '<br /></pre>'; } function _added($lines) { - return '<pre class="diff added">' . htmlspecialchars($this->_lines($lines, '+')) . '</pre>'; + return '<pre class="diff added">' . htmlspecialchars($this->_lines($lines, '+')) . '<br /></pre>'; } function _deleted($lines) { - return '<pre class="diff removed">' . htmlspecialchars($this->_lines($lines, '-')) . '</pre>'; + return '<pre class="diff removed">' . htmlspecialchars($this->_lines($lines, '-')) . '<br /></pre>'; } function _changed($orig, $final) @@ -365,7 +365,7 @@ class diff_renderer_inline extends diff_renderer */ function get_diff_content($diff) { - return '<pre>' . nl2br($this->render($diff)) . '</pre>'; + return '<pre>' . nl2br($this->render($diff)) . '<br /></pre>'; } function _start_diff() @@ -614,8 +614,8 @@ class diff_renderer_side_by_side extends diff_renderer $line = $current_context; $current_context = ''; - $output .= '<tr class="unmodified"><td><pre>' . ((strlen($line)) ? $line : ' ') . '</pre></td> - <td><pre>' . ((strlen($line)) ? $line : ' ') . '</pre></td></tr>'; + $output .= '<tr class="unmodified"><td><pre>' . ((strlen($line)) ? $line : ' ') . '<br /></pre></td> + <td><pre>' . ((strlen($line)) ? $line : ' ') . '<br /></pre></td></tr>'; } switch ($change['type']) @@ -628,7 +628,7 @@ class diff_renderer_side_by_side extends diff_renderer $line .= htmlspecialchars($_line) . '<br />'; } - $output .= '<tr><td class="added_empty"> </td><td class="added"><pre>' . ((strlen($line)) ? $line : ' ') . '</pre></td></tr>'; + $output .= '<tr><td class="added_empty"> </td><td class="added"><pre>' . ((strlen($line)) ? $line : ' ') . '<br /></pre></td></tr>'; break; case 'remove': @@ -639,7 +639,7 @@ class diff_renderer_side_by_side extends diff_renderer $line .= htmlspecialchars($_line) . '<br />'; } - $output .= '<tr><td class="removed"><pre>' . ((strlen($line)) ? $line : ' ') . '</pre></td><td class="removed_empty"> </td></tr>'; + $output .= '<tr><td class="removed"><pre>' . ((strlen($line)) ? $line : ' ') . '<br /></pre></td><td class="removed_empty"> </td></tr>'; break; case 'empty': @@ -664,7 +664,7 @@ class diff_renderer_side_by_side extends diff_renderer if (!empty($left)) { - $output .= '<td class="modified"><pre>' . $left . '</pre></td>'; + $output .= '<td class="modified"><pre>' . $left . '<br /></pre></td>'; } else if ($row < $oldsize) { @@ -677,7 +677,7 @@ class diff_renderer_side_by_side extends diff_renderer if (!empty($right)) { - $output .= '<td class="modified"><pre>' . $right . '</pre></td>'; + $output .= '<td class="modified"><pre>' . $right . '<br /></pre></td>'; } else if ($row < $newsize) { @@ -698,8 +698,8 @@ class diff_renderer_side_by_side extends diff_renderer $line = $current_context; $current_context = ''; - $output .= '<tr class="unmodified"><td><pre>' . ((strlen($line)) ? $line : ' ') . '</pre></td>'; - $output .= '<td><pre>' . ((strlen($line)) ? $line : ' ') . '</pre></td></tr>'; + $output .= '<tr class="unmodified"><td><pre>' . ((strlen($line)) ? $line : ' ') . '<br /></pre></td>'; + $output .= '<td><pre>' . ((strlen($line)) ? $line : ' ') . '<br /></pre></td></tr>'; } } } |