[Phpbb-checkins] r10167 - /branches/phpBB-3_0_0/phpBB/install/install_update.php

[Meik S. <acy...@ph...>]

Author: acydburn
Date: Sun Sep 20 17:18:41 2009
New Revision: 10167

Log:
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 ;))

Modified:
    branches/phpBB-3_0_0/phpBB/install/install_update.php

Modified: branches/phpBB-3_0_0/phpBB/install/install_update.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/install/install_update.php (original)
--- branches/phpBB-3_0_0/phpBB/install/install_update.php Sun Sep 20 17:18:41 2009
***************
*** 1469,1474 ****
--- 1469,1481 ----
  					$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
  			{