diff --git a/core/relationship_api.php b/core/relationship_api.php index 5bdbfb3236..022229043b 100644 --- a/core/relationship_api.php +++ b/core/relationship_api.php @@ -6,7 +6,7 @@ # See the README and LICENSE files for details # -------------------------------------------------------- - # $Id: relationship_api.php,v 1.16 2004-08-01 05:20:08 vboctor Exp $ + # $Id: relationship_api.php,v 1.17 2004-08-01 05:53:00 vboctor Exp $ # -------------------------------------------------------- ### Relationship API ### @@ -392,11 +392,12 @@ function relationship_get_details( $p_bug_id, $p_relationship, $p_html = false, # get the information from the related bug and prepare the link $t_bug = bug_prepare_display( bug_get( $t_related_bug_id, true ) ); $t_status = string_attribute( get_enum_element( 'status', $t_bug->status ) ); + $t_resolution = string_attribute( get_enum_element( 'resolution', $t_bug->resolution ) ); - $t_relationship_info_html = $t_relationship_descr . ''; + $t_relationship_info_html = '' . $t_relationship_descr . ''; if ( $p_html_preview == false ) { $t_relationship_info_html .= '' . bug_format_id( $t_related_bug_id ) . ''; - $t_relationship_info_html .= '' . $t_status . ' ' . $t_td; + $t_relationship_info_html .= '' . $t_status . ' ' . $t_td; } else { $t_relationship_info_html .= $t_td . bug_format_id( $t_related_bug_id ) . ''; @@ -498,7 +499,7 @@ function relationship_get_summary_html_preview( $p_bug_id ) { } if ( relationship_can_resolve_bug( $p_bug_id ) == false ) { - $t_summary .= '' . lang_get( 'relationship_warning_blocking_bugs_not_resolved' ) . ''; + $t_summary .= '' . lang_get( 'relationship_warning_blocking_bugs_not_resolved' ) . ''; } if ( !is_blank( $t_summary ) ) { diff --git a/core/string_api.php b/core/string_api.php index 6a6bcb952e..5ca8436539 100644 --- a/core/string_api.php +++ b/core/string_api.php @@ -6,7 +6,7 @@ # See the README and LICENSE files for details # -------------------------------------------------------- - # $Id: string_api.php,v 1.55 2004-07-22 13:42:02 vboctor Exp $ + # $Id: string_api.php,v 1.56 2004-08-01 05:53:00 vboctor Exp $ # -------------------------------------------------------- $t_core_dir = dirname( __FILE__ ).DIRECTORY_SEPARATOR; @@ -46,6 +46,16 @@ function string_preserve_spaces_at_bol( $p_string ) { } return implode( "\n", $lines ); } + # -------------------- + # Prepare a string to be printed without being broken into multiple lines + function string_no_break( $p_string ) { + if ( strpos( $p_string, ' ' ) !== false ) { + return "$p_string"; + } else { + return $p_string; + } + } + # -------------------- # Prepare a string for display to HTML function string_display( $p_string ) { diff --git a/view_all_inc.php b/view_all_inc.php index adc9196607..3e626d2e19 100644 --- a/view_all_inc.php +++ b/view_all_inc.php @@ -6,7 +6,7 @@ # See the README and LICENSE files for details # -------------------------------------------------------- - # $Id: view_all_inc.php,v 1.141 2004-05-26 05:25:18 int2str Exp $ + # $Id: view_all_inc.php,v 1.142 2004-08-01 05:53:01 vboctor Exp $ # -------------------------------------------------------- ?> "; if ( $v_sponsorship_total > 0 ) { - echo sponsorship_format_amount( $v_sponsorship_total ); + $t_sponsorship_amount = sponsorship_format_amount( $v_sponsorship_total ); + echo string_no_break( $t_sponsorship_amount ); } echo "\n"; }