Skip to content

Commit

Permalink
Add tags to email notifications when set
Browse files Browse the repository at this point in the history
Fixes #20857
  • Loading branch information
vboctor committed Apr 30, 2016
1 parent 6abac24 commit fcd4939
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 0 deletions.
16 changes: 16 additions & 0 deletions core/email_api.php
Expand Up @@ -1464,6 +1464,11 @@ function email_format_bug_message( array $p_visible_bug_data ) {
$t_message .= email_format_attribute( $p_visible_bug_data, 'email_project' );
$t_message .= email_format_attribute( $p_visible_bug_data, 'email_bug' );
$t_message .= email_format_attribute( $p_visible_bug_data, 'email_category' );

if( isset( $p_visible_bug_data['email_tag'] ) ) {
$t_message .= email_format_attribute( $p_visible_bug_data, 'email_tag' );
}

$t_message .= email_format_attribute( $p_visible_bug_data, 'email_reproducibility' );
$t_message .= email_format_attribute( $p_visible_bug_data, 'email_severity' );
$t_message .= email_format_attribute( $p_visible_bug_data, 'email_priority' );
Expand Down Expand Up @@ -1635,6 +1640,17 @@ function email_build_visible_bug_data( $p_user_id, $p_bug_id, $p_message_id ) {
$t_category_name = category_full_name( $t_row['category_id'], false );
$t_bug_data['email_category'] = $t_category_name;

$t_tag_rows = tag_bug_get_attached( $p_bug_id );
if( !empty( $t_tag_rows ) && access_compare_level( $t_user_access_level, config_get( 'tag_view_threshold' ) ) ) {
$t_bug_data['email_tag'] = '';

foreach( $t_tag_rows as $t_tag ) {
$t_bug_data['email_tag'] .= $t_tag['name'] . ', ';
}

$t_bug_data['email_tag'] = trim( $t_bug_data['email_tag'], ', ' );
}

$t_bug_data['email_date_submitted'] = $t_row['date_submitted'];
$t_bug_data['email_last_modified'] = $t_row['last_updated'];

Expand Down
1 change: 1 addition & 0 deletions lang/strings_english.txt
Expand Up @@ -336,6 +336,7 @@ $s_email_summary = 'Summary';
$s_email_description = 'Description';
$s_email_additional_information = 'Additional Information';
$s_email_steps_to_reproduce = 'Steps to Reproduce';
$s_email_tag = 'Tags';

# account_delete.php
$s_account_protected_msg = 'Account protected. Cannot change settings...';
Expand Down

0 comments on commit fcd4939

Please sign in to comment.