Index: bug_report_advanced_page.php
===================================================================
RCS file: /cvsroot/mantisbt/mantisbt/bug_report_advanced_page.php,v
retrieving revision 1.36
diff -r1.36 bug_report_advanced_page.php
200a201,206
> <?php
> 	$t_show_version = ( ON == config_get( 'show_product_version' ) ) 
> 			|| ( ( AUTO == config_get( 'show_product_version' ) ) 
> 						&& ( count( version_get_all_rows( $t_project_id ) ) > 0 ) );
> 	if ( $t_show_version ) { 
> ?>
212c218,220
< 
---
> <?php
> 	} 
> ?>
Index: bug_report_page.php
===================================================================
RCS file: /cvsroot/mantisbt/mantisbt/bug_report_page.php,v
retrieving revision 1.38
diff -r1.38 bug_report_page.php
134c134,139
< 
---
> <?php
> 	$t_show_version = ( ON == config_get( 'show_product_version' ) ) 
> 			|| ( ( AUTO == config_get( 'show_product_version' ) ) 
> 						&& ( count( version_get_all_rows( $t_project_id ) ) > 0 ) );
> 	if ( $t_show_version ) { 
> ?>
145a151,153
> <?php
> 	} 
> ?>
Index: bug_update_advanced_page.php
===================================================================
RCS file: /cvsroot/mantisbt/mantisbt/bug_update_advanced_page.php,v
retrieving revision 1.69
diff -r1.69 bug_update_advanced_page.php
284a285
> 	<!-- Fixed in Version -->
286c287,294
< 		<?php echo lang_get( 'fixed_in_version' ) ?>
---
> 		<?php
> 			$t_show_version = ( ON == config_get( 'show_product_version' ) ) 
> 					|| ( ( AUTO == config_get( 'show_product_version' ) ) 
> 								&& ( count( version_get_all_rows( $t_bug->project_id ) ) > 0 ) );
> 			if ( $t_show_version ) { 
> 				echo lang_get( 'fixed_in_version' ); 
> 			}
> 		?>
288a297,299
> 		<?php
> 			if ( $t_show_version ) { 
> 		?>
291a303,305
> 		<?php
> 			}
> 		?>
294c308
< 	<!-- Product Version -->
---
> 	<!-- Product Version  or Product Build, if version is suppressed -->
296c310,316
< 		<?php echo lang_get( 'product_version' ) ?>
---
> 		<?php 
> 			if ( $t_show_version ) { 
> 				echo lang_get( 'product_version' );
> 			}else{
> 				echo lang_get( 'build' );
> 			}
> 		?>
298a319,321
> 		<?php 
> 			if ( $t_show_version ) { 
> 		?>
301a325,332
> 		<?php
> 			}else{
> 		?>
> 		<input type="text" name="build" size="16" maxlength="32" value="<?php echo $t_bug->build ?>" />
> 		<?php
> 			}
> 		?>
> 		
305a337,339
> <?php 
> 	if ( $t_show_version ) { 
> ?>
320a355,357
> <?php
> 	}
> ?>
Index: bug_update_page.php
===================================================================
RCS file: /cvsroot/mantisbt/mantisbt/bug_update_page.php,v
retrieving revision 1.70
diff -r1.70 bug_update_page.php
239c239,244
< 
---
> <?php
> 	$t_show_version = ( ON == config_get( 'show_product_version' ) ) 
> 			|| ( ( AUTO == config_get( 'show_product_version' ) ) 
> 						&& ( count( version_get_all_rows( $t_project_id ) ) > 0 ) );
> 	if ( $t_show_version ) { 
> ?>
250a256,258
> <?php
> 	}
> ?>
Index: bug_view_advanced_page.php
===================================================================
RCS file: /cvsroot/mantisbt/mantisbt/bug_view_advanced_page.php,v
retrieving revision 1.54
diff -r1.54 bug_view_advanced_page.php
282c282
< 	<!-- spacer -->
---
> 	<!-- fixed in version -->
284c284,291
< 		<?php echo lang_get( 'fixed_in_version' ); ?>
---
> 		<?php 
> 			$t_show_version = ( ON == config_get( 'show_product_version' ) ) 
> 					|| ( ( AUTO == config_get( 'show_product_version' ) ) 
> 								&& ( count( version_get_all_rows( $t_bug->project_id ) ) > 0 ) );
> 			if ( $t_show_version ) { 
> 				echo lang_get( 'fixed_in_version' );
> 			}
> 		?>
287c294,298
< 		<?php echo $t_bug->fixed_in_version ?>
---
> 		<?php 
> 			if ( $t_show_version ) { 
> 				echo $t_bug->fixed_in_version; 
> 			}
> 		?>
290c301
< 	<!-- Product Version -->
---
> 	<!-- Product Version or Product Build, if version is suppressed -->
292c303,309
< 		<?php echo lang_get( 'product_version' ) ?>
---
> 		<?php 
> 			if ( $t_show_version ) { 
> 				echo lang_get( 'product_version' ); 
> 			}else{
> 				echo lang_get( 'product_build' );
> 			}
> 		?>
295c312,318
< 		<?php echo $t_bug->version ?>
---
> 		<?php  
> 			if ( $t_show_version ) { 
> 				echo $t_bug->version; 
> 			}else{
> 				echo $t_bug->build;
> 			}
> 		?>
300c323,325
< 
---
> <?php
> 	if( $t_show_version ) {
> ?>
315c340,342
< 
---
> <?php
> 	}
> ?>
Index: config_defaults_inc.php
===================================================================
RCS file: /cvsroot/mantisbt/mantisbt/config_defaults_inc.php,v
retrieving revision 1.173
diff -r1.173 config_defaults_inc.php
343a344,349
> 	# --- show product versions in create, view and update screens
> 	#  ON forces display even if none are defined
> 	#  OFF suppresses display
> 	#  AUTO suppresses the display if there are no versions defined for the project
> 	$g_show_product_version = AUTO;
> 
Index: core/constant_inc.php
===================================================================
RCS file: /cvsroot/mantisbt/mantisbt/core/constant_inc.php,v
retrieving revision 1.18
diff -r1.18 constant_inc.php
18a19
> 	define( 'AUTO', 3 );