else
{
$class = "merge-successful";
}
$col3 = $chunk->get_text_left();
}
// possible classes: unchanged, notext, deleted, added, changed
echo "<tr>\n\t";
echo '<td width="33%" valign="top" class="' . $class . '" dir="ltr">';
echo format_diff_text($col1, $wrap);
echo '</td><td width="34%" valign="top" class="' . $class . '" dir="ltr">';
echo format_diff_text($col2, $wrap);
echo '</td><td width="33%" valign="top" class="' . $class . '" dir="ltr">';
echo format_diff_text($col3, $wrap);
echo "</td></tr>\n\n";
}
}
print_table_footer();
echo '<br />';
docompare3_print_control_form($inline, $wrap);
print_form_header('', '');
print_table_header($vbphrase['comparison_key']);
$conflictkey = "";
echo '<tr><td class="merge-conflict" align="center">' . $vbphrase['merge_key_conflict'] .
$conflictkey . "</td></tr>\n";
echo '<tr><td class="merge-successful" align="center">' . $vbphrase['merge_key_merged'] . "</td></tr>\n";
/**
* Format the text for a merge conflict
*
* Take the three conflict text strings and format them into a human readable
* text block for display.
*
* @param string Text from custom template
* @param string Text from origin template
* @param string Text from current VBulletin template
* @param string Version string for origin template
* @param string Version string for currnet VBulletin template
* @param bool Whether to output the wrapping text with html markup for richer display
*
* @return string -- combined text
*/
function format_conflict_text($custom, $origin, $new, $origin_version, $new_version, $html_markup = false, $wrap = true)
{
global $vbphrase;
$new_title = $vbphrase['new_default_value'];
$origin_title = $vbphrase['old_default_value'];
$custom_title = $vbphrase['your_customized_value'];
if ($html_markup)
{
$text =
"<div class=\"merge-conflict-row\"><b>$custom_title</b><div>" . format_diff_text($custom, $wrap) . "</div></div>"
. "<div class=\"merge-conflict-row\"><b>$origin_title</b><div>" . format_diff_text($origin, $wrap) . "</div></div>"
. "<div class=\"merge-conflict-final-row\"><b>$new_title</b><div>" . format_diff_text($new, $wrap) . "</div></div>";
}
else
{
$origin_bar = "======== $origin_title ========";
$text = "<<<<<<<< $custom_title <<<<<<<<\n";
$text .= $custom;
$text .= $origin_bar . "\n";
$text .= $origin;
$text .= str_repeat("=", strlen($origin_bar)) . "\n";
$text .= $new;
$text .= ">>>>>>>> $new_title >>>>>>>>\n";
}
return $text;
}
