From 7a244e1d2bd62f87d678c754b0890fb7ac379673 Mon Sep 17 00:00:00 2001
From: Meik Sievertsen <acydburn@phpbb.com>
Date: Sun, 20 Sep 2009 16:18:41 +0000
Subject: [PATCH] if preserve_cr is true and the file generated no conflict but
 is obviously not "empty" we tag it as modified because preserve_cr is the
 default mode for showing modifications (else the user gets a resolvable
 conflict and may wonder why ;))

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10167 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/install/install_update.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/phpBB/install/install_update.php b/phpBB/install/install_update.php
index 3c16a2e82b..ab7ec35705 100644
--- a/phpBB/install/install_update.php
+++ b/phpBB/install/install_update.php
@@ -1469,6 +1469,13 @@ class install_update extends module
 					$update_list['up_to_date'][] = $update_ary;
 					return;
 				}
+
+				// If we preserve cr tag it as modified because the conflict would not show in this mode anyway
+				if ($preserve_cr)
+				{
+					$update_list['modified'][] = $update_ary;
+					return;
+				}
 			}
 			else
 			{