From 186abf0798463d2bb9e37117ec7d451efd37b7a1 Mon Sep 17 00:00:00 2001
From: Meik Sievertsen <acydburn@phpbb.com>
Date: Fri, 4 Sep 2009 14:50:05 +0000
Subject: phpBB updater now skips sole whitespace changes. This reduces the
 chance of conflicts tremendously.

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10102 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/docs/CHANGELOG.html      |  1 +
 phpBB/includes/diff/engine.php | 16 ++++++++++++++++
 2 files changed, 17 insertions(+)

(limited to 'phpBB')

diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html
index 3fc6ceaa52..abd7719c0d 100644
--- a/phpBB/docs/CHANGELOG.html
+++ b/phpBB/docs/CHANGELOG.html
@@ -240,6 +240,7 @@
 		<li>[Change] Do not take edit post time into account for determining permission to delete last post in topic. (Bug #48615)</li>
 		<li>[Change] Resize oversized Topic icons (Bug #44415)</li>
 		<li>[Change] Banned IPs are now sorted (Bug #43045 - Patch by DavidIQ)</li>
+		<li>[Change] phpBB updater now skips sole whitespace changes. This reduces the chance of conflicts tremendously.</li>
 		<li>[Feature] Add language selection on the registration terms page (Bug #15085 - Patch by leviatan21)</li>
 		<li>[Feature] Backported 3.2 captcha plugins.
 			<ul>
diff --git a/phpBB/includes/diff/engine.php b/phpBB/includes/diff/engine.php
index eb0dcce395..e9f0e41b75 100644
--- a/phpBB/includes/diff/engine.php
+++ b/phpBB/includes/diff/engine.php
@@ -49,6 +49,8 @@ if (!defined('IN_PHPBB'))
 */
 class diff_engine
 {
+	var $skip_whitespace_changes = true;
+
 	function diff(&$from_lines, &$to_lines, $preserve_cr = true)
 	{
 		// Remove empty lines...
@@ -176,6 +178,20 @@ class diff_engine
 				$add[] = $to_lines[$yi++];
 			}
 
+			// Here we are a bit naughty. Naughty Boy... Naughty Boy...
+			// We check if delete and add is filled and only consist of one item
+			if ($this->skip_whitespace_changes && sizeof($delete) == 1 && sizeof($add) == 1)
+			{
+				// Now we simply trim the string and see if the lines are identical
+				// If they are identical we do not need to take them into account for the merge (less conflicts in phpBB)
+				if (trim($delete[0]) === trim($add[0]))
+				{
+					// This line ensures the line found here is correctly copied later (remember: we naughty boys like loops)
+					$xi--; $yi--; $this->xchanged[$xi] = $this->ychanged[$yi] = false;
+					$delete = $add = array();
+				}
+			}
+
 			if ($delete && $add)
 			{
 				$edits[] = new diff_op_change($delete, $add);
-- 
cgit v1.2.1