Merge commit 'release-3.0.7-RC2'

3 files changed, 52 insertions, 18 deletions

diff --git a/build/build_diff.php b/build/build_diff.php
index ab3bb774b7..9cd99bdb72 100755
--- a/build/build_diff.php
+++ b/build/build_diff.php
@@ -11,9 +11,9 @@
 
 // CONFIG - Begin
 $substitute_old = '3.0.6';
-$substitute_new = '3.0.7-RC1';
+$substitute_new = '3.0.7-RC2';
 $simple_name_old = 'phpbb306';
-$simple_name_new = 'phpbb307-RC1';
+$simple_name_new = 'phpbb307-RC2';
 $echo_changes = false;
 // Set this to true to just compress the changes and do not build them again
 // This should be used for building custom modified txt file. ;)
@@ -405,4 +405,4 @@ function run_command($command)
 	echo "\n- Command Run: " . $command . "\n";
 }
 
-?>
\ No newline at end of file
+?>
diff --git a/build/diff_class.php b/build/diff_class.php
index 0d7c2dcd3a..4625ffde24 100644
--- a/build/diff_class.php
+++ b/build/diff_class.php
@@ -1181,7 +1181,19 @@ class BBCodeDiffFormatter extends DiffFormatter
 			$text = implode('', $order_array['find_c']);
 			if ($text === "\n" || $text === "\t" || $text === '')
 			{
-				return true;
+				if (isset($order_array['first_find_c'][0]) &&
+					is_array($order_array['first_find_c'][0]) &&
+					trim(implode('', $order_array['first_find_c'][0])) != '' &&
+					isset($order_array['replace']))
+				{
+					$order_array['add'] = $order_array['replace'];
+					unset($order_array['replace']);
+					// this is actually an after add
+				}
+				else
+				{
+					return true;
+				}
 			}
 		}
 
@@ -1223,18 +1235,42 @@ class BBCodeDiffFormatter extends DiffFormatter
 				$text = implode('', $order_array['find_c']);
 				if ($text === "\n" || $text === "\t" || $text === '')
 				{
-					continue;
+					// no real find, use first_find_c if possible!
+					//var_dump($order_array);
+					if (is_array($order_array['first_find_c'][0]))
+					{
+						$order_array['find_c'] = $order_array['first_find_c'][0];
+					}
+					else
+					{
+						if (isset($order_array['replace']) || isset($order_array['add']) || isset($order_array['delete']))
+						{
+							echo "skipped an edit!\n";
+							var_dump($order_array);
+						}
+						continue;
+					}
 				}
-
-				if (strlen(implode('', $order_array['find_c'])) < 50 && is_array($order_array['first_find_c'][0]))
+				else
 				{
-					$html .= "#\n#-----[ FIND ]---------------------------------------------\n# Around Line {$ybeg}\n";
-					$html .= implode("", $order_array['first_find_c'][0]);
-					$html .= "\n";
-					$ybeg += sizeof($order_array['first_find_c'][0]);
+					if (strlen(implode('', $order_array['find_c'])) < 50 && is_array($order_array['first_find_c'][0]))
+					{
+						$html .= "#\n#-----[ FIND ]---------------------------------------------\n# Around Line {$ybeg}\n";
+						$html .= implode("", $order_array['first_find_c'][0]);
+						$html .= "\n";
+						$ybeg += sizeof($order_array['first_find_c'][0]);
+					}
 				}
 			}
 
+			// still here but nothing to do? what the heck?
+			if (!isset($order_array['replace']) && !isset($order_array['add']) && !isset($order_array['delete']))
+			{
+				echo "skipped an edit!\n";
+				var_dump($order_array);
+				continue;
+			}
+
 			if (sizeof($order_array['find_c']))
 			{
 				$html .= "#\n#-----[ FIND ]---------------------------------------------\n# Around Line {$ybeg}\n";
@@ -1309,7 +1345,7 @@ class BBCodeDiffFormatter extends DiffFormatter
 			{
 				if (isset($hunk['a']) && isset($hunk['d']))
 				{
-	/*				if (sizeof($hunk['a']) == 1 && sizeof($hunk['d']) == 1)
+	/**/				if (sizeof($hunk['a']) == 1 && sizeof($hunk['d']) == 1)
 					{
 						if (preg_match('/\* @version \$Id:.+\$$/', $hunk['a'][0]) && preg_match('/\* @version \$Id:.+\$$/', $hunk['d'][0]))
 						{
@@ -1318,7 +1354,7 @@ class BBCodeDiffFormatter extends DiffFormatter
 							$reorder = true;
 							continue;
 						}
-					}*/
+					}/**/
 
 					// Compare the add and replace one...
 					$string_1 = rtrim(trim(implode('', $hunk['a'])));
@@ -1349,7 +1385,7 @@ class BBCodeDiffFormatter extends DiffFormatter
 			{
 				if (isset($hunk['a']) && isset($hunk['d']))
 				{
-	/*				if (sizeof($hunk['a']) == 1 && sizeof($hunk['d']) == 1)
+	/**/				if (sizeof($hunk['a']) == 1 && sizeof($hunk['d']) == 1)
 					{
 						if (preg_match('/\* @version \$Id:.+\$$/', $hunk['a'][0]) && preg_match('/\* @version \$Id:.+\$$/', $hunk['d'][0]))
 						{
@@ -1358,7 +1394,7 @@ class BBCodeDiffFormatter extends DiffFormatter
 							$reorder = true;
 							continue;
 						}
-					}*/
+					}/**/
 
 					// Compare the add and replace one...
 					$string_1 = rtrim(trim(implode('', $hunk['a'])));
@@ -1673,5 +1709,3 @@ class MODXDiffFormatter extends BBCodeDiffFormatter
 	{
 	}
 }
-
-?>
\ No newline at end of file
diff --git a/build/package.php b/build/package.php
index 50a9e76ab7..68bdfb5a13 100755
--- a/build/package.php
+++ b/build/package.php
@@ -15,7 +15,7 @@
 // If RC8 drops remove the install/data directory
 //$versions = array('3.0.2', '3.0.3-RC1', '3.0.3', '3.0.4-RC1', '3.0.4', '3.0.5-RC1', '3.0.5', '3.0.6-RC1', '3.0.6-RC2', '3.0.6-RC3');
 //$versions = array('3.0.2', '3.0.3', '3.0.4', '3.0.5', '3.0.6', '3.0.7-RC1', '3.0.7');
-$versions = array('3.0.2', '3.0.3-RC1', '3.0.3', '3.0.4-RC1', '3.0.4', '3.0.5-RC1', '3.0.5', '3.0.6-RC1', '3.0.6-RC2', '3.0.6-RC3', '3.0.6-RC4', '3.0.6', '3.0.7-RC1');
+$versions = array('3.0.2', '3.0.3-RC1', '3.0.3', '3.0.4-RC1', '3.0.4', '3.0.5-RC1', '3.0.5', '3.0.6-RC1', '3.0.6-RC2', '3.0.6-RC3', '3.0.6-RC4', '3.0.6', '3.0.7-RC1', '3.0.7-RC2');
 $verbose = false;
 
 require('build_helper.php');