diff --git a/account_sponsor_page.php b/account_sponsor_page.php index 618ea7e59e..fd7fa55933 100644 --- a/account_sponsor_page.php +++ b/account_sponsor_page.php @@ -127,7 +127,7 @@ $t_sponsor = sponsorship_get( $row['sponsor'] ); # describe bug - $t_status = string_attribute( get_enum_element( 'status', $t_bug->status ) ); + $t_status = string_attribute( get_enum_element( 'status', $t_bug->status, auth_get_current_user_id(), $t_bug->project_id ) ); $t_resolution = string_attribute( get_enum_element( 'resolution', $t_bug->resolution ) ); $t_version_id = version_get_id( $t_bug->fixed_in_version, $t_project ); if ( ( false !== $t_version_id ) && ( VERSION_RELEASED == version_get_field( $t_version_id, 'released' ) ) ) { @@ -191,7 +191,7 @@ $query = "SELECT b.id as bug, s.id as sponsor, s.paid, b.project_id, b.fixed_in_version, b.status FROM $t_bug_table b, $t_sponsor_table s - WHERE b.handler_id=" . db_param() . " AND s.bug_id = b.id " . + WHERE b.handler_id=" . db_param() . " AND s.bug_id = b.id " . ( $t_show_all ? '' : 'AND ( b.status < ' . db_param() . ' OR s.paid < ' . SPONSORSHIP_PAID . ')' ) . " AND $t_project_clause ORDER BY s.paid ASC, b.project_id ASC, b.fixed_in_version ASC, b.status ASC, b.id DESC"; @@ -237,7 +237,7 @@ $t_buglist[] = $row['bug'] . ':' . $row['sponsor']; # describe bug - $t_status = string_attribute( get_enum_element( 'status', $t_bug->status ) ); + $t_status = string_attribute( get_enum_element( 'status', $t_bug->status, auth_get_current_user_id(), $t_bug->project_id ) ); $t_resolution = string_attribute( get_enum_element( 'resolution', $t_bug->resolution ) ); $t_version_id = version_get_id( $t_bug->fixed_in_version, $t_project ); if ( ( false !== $t_version_id ) && ( VERSION_RELEASED == version_get_field( $t_version_id, 'released' ) ) ) { diff --git a/core/columns_api.php b/core/columns_api.php index 95aa08124a..96e94d6550 100644 --- a/core/columns_api.php +++ b/core/columns_api.php @@ -1127,7 +1127,7 @@ function print_column_resolution( $p_bug, $p_columns_target = COLUMNS_TARGET_VIE */ function print_column_status( $p_bug, $p_columns_target = COLUMNS_TARGET_VIEW_PAGE ) { echo ''; - printf( '%s', get_enum_element( 'resolution', $p_bug->resolution ), get_enum_element( 'status', $p_bug->status ) ); + printf( '%s', get_enum_element( 'resolution', $p_bug->resolution ), get_enum_element( 'status', $p_bug->status, auth_get_current_user_id(), $p_bug->project_id ) ); # print username instead of status if(( ON == config_get( 'show_assigned_names' ) ) && ( $p_bug->handler_id > 0 ) && ( access_has_project_level( config_get( 'view_handler_threshold' ), $p_bug->project_id ) ) ) { diff --git a/core/custom_function_api.php b/core/custom_function_api.php index a60068af2d..20b3189e9d 100644 --- a/core/custom_function_api.php +++ b/core/custom_function_api.php @@ -63,7 +63,7 @@ function custom_function_default_changelog_print_issue( $p_issue_id, $p_issue_le } if( !isset( $t_status[$t_bug->status] ) ) { - $t_status[$t_bug->status] = get_enum_element( 'status', $t_bug->status ); + $t_status[$t_bug->status] = get_enum_element( 'status', $t_bug->status, auth_get_current_user_id(), $t_bug->project_id ); } echo ' - ', $t_status[$t_bug->status], '.
'; } @@ -102,7 +102,7 @@ function custom_function_default_roadmap_print_issue( $p_issue_id, $p_issue_leve } if( !isset( $t_status[$t_bug->status] ) ) { - $t_status[$t_bug->status] = get_enum_element( 'status', $t_bug->status ); + $t_status[$t_bug->status] = get_enum_element( 'status', $t_bug->status, auth_get_current_user_id(), $t_bug->project_id ); } echo ' - ', $t_status[$t_bug->status], $t_strike_end, '.
'; }