| Description | Hi guys,
I just noticed a confusing behaviour of mantis when used with Source Control integration.
It has to do with having multiple issues fixed on the one line, but doesn't depend on it.
Anyhow, core/checkin.php uses the regex $g_source_control_regexp to detect issue numbers for fixed issues, but when rendring issue notes and comments it uses $g_bug_link_tag to detect issues (and mark them up with html links). This is a confusing behaviour.
Wouldn't it be better if we used the same (regex) logic that identifies issue's in commit logs to identify (and mark up) issues in issue text, notes and history?
Am relating this to 0007330, since multiple comma-separated issue matching is a tricky one. If we can get 0007330 to work nicer it would make sense to then use that code to mark up the text in an issue for issue numbers with URLs. |
|---|
| Attached Files |
string_process_bug_link.txt (1,249 bytes)
function string_process_bug_link( $p_string, $p_include_anchor = true, $p_detail_info = true, $p_fqdn = false ) {
$t_tag = config_get( 'bug_link_tag' );
# bail if the link tag is blank
if ( '' == $t_tag ) {
return $p_string;
}
$t_commit_regexp = config_get( 'source_control_regexp' );
$t_issue_number_regexp = config_get( 'source_control_issue_number_regexp' );
$t_comment = '';
$t_issues = array();
$t_fixed_issues = array();
$t_lines = split(chr(10), $p_string);
foreach ($t_lines as $t_line) {
if ( preg_match_all( $t_commit_regexp, $t_line, $t_matches ) ) {
# now extract all the issue numbers
$t_issue_full_text = $t_matches[0][0];
if ( preg_match_all( $t_issue_number_regexp, $t_issue_full_text, $t_matches ) ) {
for ( $i = 0; $i < count( $t_matches[0] ); ++$i ) {
$t_issues[] = $t_matches[0][$i];
if ( $p_include_anchor ) {
$t_line = str_replace($t_matches[0][$i], string_get_bug_view_link( $t_matches[0][$i], null, $p_detail_info, $p_fqdn ), $t_line);
} else {
$t_line = str_replace($t_matches[0][$i], string_get_bug_view_url_with_fqdn( $t_bug_id, null ), $t_line);
}
}
}
}
$t_comment .= $t_line.chr(10);
}
return $t_comment;
}
new_string_process_bug_link.txt (1,085 bytes)
function string_process_bug_link( $p_string, $p_include_anchor = true, $p_detail_info = true, $p_fqdn = false ) {
$t_commit_regexp = config_get( 'source_control_regexp' );
$t_issue_number_regexp = config_get( 'source_control_issue_number_regexp' );
$t_comment = '';
$t_matches = array();
$t_lines = array();
$t_lines = split(chr(10), $p_string);
foreach ($t_lines as $t_line) {
if ( preg_match_all( $t_commit_regexp, $t_line, $t_matches ) ) {
$t_issue_full_text = $t_matches[0][0];
if ( preg_match_all( $t_issue_number_regexp, $t_issue_full_text, $t_matches ) ) {
for ( $i = 0; $i < count( $t_matches[0] ); ++$i ) {
$t_bug_id = $t_matches[0][$i];
if ( !$p_include_anchor ) {
$t_line = str_replace($t_bug_id , string_get_bug_view_url_with_fqdn( $t_bug_id , null ), $t_line);
} elseif(bug_exists( $t_bug_id )) {
$t_line = str_replace($t_bug_id , string_get_bug_view_link( $t_bug_id , null, $p_detail_info, $p_fqdn ), $t_line);
}
}
}
}
$t_comment .= $t_line.chr(10);
}
return $t_comment;
}
|
|---|
