diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2009-09-20 16:18:41 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2009-09-20 16:18:41 +0000 |
| commit | 7a244e1d2bd62f87d678c754b0890fb7ac379673 (patch) | |
| tree | 02e1da0ecf3e2dc783c670921167e1a8393a7370 /phpBB | |
| parent | 1b64e411606168802ebc164a1b42c2c2bfb2d972 (diff) | |
| download | forums-7a244e1d2bd62f87d678c754b0890fb7ac379673.tar forums-7a244e1d2bd62f87d678c754b0890fb7ac379673.tar.gz forums-7a244e1d2bd62f87d678c754b0890fb7ac379673.tar.bz2 forums-7a244e1d2bd62f87d678c754b0890fb7ac379673.tar.xz forums-7a244e1d2bd62f87d678c754b0890fb7ac379673.zip | |
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
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/install/install_update.php | 7 |
1 files changed, 7 insertions, 0 deletions
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 { |