From f0cc1229487adb1f4dccfdc26efdbfd7f4db199e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Dr=C3=B6scher?= <dhn2@users.sourceforge.net>
Date: Sun, 28 Jan 2007 16:46:26 +0000
Subject: First bunch of changes for #5712

git-svn-id: file:///svn/phpbb/trunk@6947 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/includes/diff/renderer.php | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'phpBB/includes/diff')

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 : '&nbsp;') . '</pre></td>
-							<td><pre>' . ((strlen($line)) ? $line : '&nbsp;') . '</pre></td></tr>';
+						$output .= '<tr class="unmodified"><td><pre>' . ((strlen($line)) ? $line : '&nbsp;') . '<br /></pre></td>
+							<td><pre>' . ((strlen($line)) ? $line : '&nbsp;') . '<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">&nbsp;</td><td class="added"><pre>' . ((strlen($line)) ? $line : '&nbsp;') . '</pre></td></tr>';
+							$output .= '<tr><td class="added_empty">&nbsp;</td><td class="added"><pre>' . ((strlen($line)) ? $line : '&nbsp;') . '<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 : '&nbsp;') . '</pre></td><td class="removed_empty">&nbsp;</td></tr>';
+							$output .= '<tr><td class="removed"><pre>' . ((strlen($line)) ? $line : '&nbsp;') . '<br /></pre></td><td class="removed_empty">&nbsp;</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 : '&nbsp;') . '</pre></td>';
-					$output .= '<td><pre>' . ((strlen($line)) ? $line : '&nbsp;') . '</pre></td></tr>';
+					$output .= '<tr class="unmodified"><td><pre>' . ((strlen($line)) ? $line : '&nbsp;') . '<br /></pre></td>';
+					$output .= '<td><pre>' . ((strlen($line)) ? $line : '&nbsp;') . '<br /></pre></td></tr>';
 				}
 			}
 		}
-- 
cgit v1.2.1