From 4b5fab372ff69a809144dee3a0a7f90c219fe400 Mon Sep 17 00:00:00 2001
From: Meik Sievertsen <acydburn@phpbb.com>
Date: Wed, 30 Jan 2008 16:14:39 +0000
Subject: merge with revision #r8350

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

(limited to 'phpBB/includes/diff/renderer.php')

diff --git a/phpBB/includes/diff/renderer.php b/phpBB/includes/diff/renderer.php
index 11745dab3d..7d5cd9e5d3 100644
--- a/phpBB/includes/diff/renderer.php
+++ b/phpBB/includes/diff/renderer.php
@@ -301,7 +301,7 @@ class diff_renderer_unified extends diff_renderer
 	{
 		return '<pre class="diff context">' . htmlspecialchars($this->_lines($lines, ' ')) . '<br /></pre>';
 	}
-	
+
 	function _added($lines)
 	{
 		return '<pre class="diff added">' . htmlspecialchars($this->_lines($lines, '+')) . '<br /></pre>';
@@ -448,7 +448,7 @@ class diff_renderer_inline extends diff_renderer
 		// Therefore we split on words, but include all blocks of whitespace in the wordlist.
 		$splitted_text_1 = $this->_split_on_words($text1, $nl);
 		$splitted_text_2 = $this->_split_on_words($text2, $nl);
-		
+
 		$diff = &new diff($splitted_text_1, $splitted_text_2);
 		unset($splitted_text_1, $splitted_text_2);
 
@@ -463,7 +463,7 @@ class diff_renderer_inline extends diff_renderer
 	{
 		// Ignore \0; otherwise the while loop will never finish.
 		$string = str_replace("\0", '', $string);
-		
+
 		$words = array();
 		$length = strlen($string);
 		$pos = 0;
@@ -537,7 +537,7 @@ class diff_renderer_raw extends diff_renderer
 	{
 		return $this->_lines($lines, ' ');
 	}
-	
+
 	function _added($lines)
 	{
 		return $this->_lines($lines, '+');
@@ -603,7 +603,7 @@ class diff_renderer_side_by_side extends diff_renderer
 			// Iterate through every header block of changes
 			foreach ($this->lines as $header)
 			{
-				$output .= '<tr><th>Line ' . $header['oldline'] . '</th><th>' . $user->lang['LINE'] . ' ' . $header['newline'] . '</th></tr>';
+				$output .= '<tr><th>' . $user->lang['LINE'] . ' ' . $header['oldline'] . '</th><th>' . $user->lang['LINE'] . ' ' . $header['newline'] . '</th></tr>';
 
 				// Each header block consists of a number of changes (add, remove, change).
 				$current_context = '';
-- 
cgit v1.2.1