Index: bug_view_page.php
===================================================================
RCS file: /cvsroot/mantisbt/mantisbt/bug_view_page.php,v
retrieving revision 1.85
diff -u -r1.85 bug_view_page.php
--- bug_view_page.php	6 Mar 2007 07:05:18 -0000	1.85
+++ bug_view_page.php	12 Apr 2007 09:25:08 -0000
@@ -431,20 +431,15 @@
 	# User list monitoring the bug
 	include( $t_mantis_dir . 'bug_monitor_list_view_inc.php' );
 
-	# Bugnotes
-	include( $t_mantis_dir . 'bugnote_add_inc.php' );
-	include( $t_mantis_dir . 'bugnote_view_inc.php' );
-?>
-	<!-- Jump to Bugnote add form -->
-<?php
-	if ( ( $t_bug->status < config_get( 'bug_resolved_status_threshold' ) ) &&
-		( access_has_bug_level( config_get( 'add_bugnote_threshold' ), $f_bug_id ) ) )
-	{
-?>
-	<span class="small"><?php print_bracket_link( "#addbugnote", lang_get( 'add_bugnote_button' ) ) ?></span>
-	<br />
-<?php } ?>
-<?php
+	# Bugnotes and "Add Note" box
+	if ( 'ASC' == current_user_get_pref( 'bugnote_order' ) ) {
+		include( $t_mantis_dir . 'bugnote_view_inc.php' );
+		include( $t_mantis_dir . 'bugnote_add_inc.php' );
+	} else {
+		include( $t_mantis_dir . 'bugnote_add_inc.php' );
+		include( $t_mantis_dir . 'bugnote_view_inc.php' );
+	}
+
 	# Time Tracking stats
 	if ( config_get('time_tracking_enabled') &&
 		access_has_bug_level( config_get( 'time_tracking_reporting_threshold' ), $f_bug_id ) ) {
Index: bug_view_advanced_page.php
===================================================================
RCS file: /cvsroot/mantisbt/mantisbt/bug_view_advanced_page.php,v
retrieving revision 1.83
diff -u -r1.83 bug_view_advanced_page.php
--- bug_view_advanced_page.php	6 Mar 2007 07:05:18 -0000	1.83
+++ bug_view_advanced_page.php	12 Apr 2007 09:25:08 -0000
@@ -553,9 +553,14 @@
 	# User list monitoring the bug
 	include( $t_mantis_dir . 'bug_monitor_list_view_inc.php' );
 
-	# Bugnotes
-	include( $t_mantis_dir . 'bugnote_add_inc.php' );
-	include( $t_mantis_dir . 'bugnote_view_inc.php' );
+	# Bugnotes and "Add Note" box
+	if ( 'ASC' == current_user_get_pref( 'bugnote_order' ) ) {
+		include( $t_mantis_dir . 'bugnote_view_inc.php' );
+		include( $t_mantis_dir . 'bugnote_add_inc.php' );
+	} else {
+		include( $t_mantis_dir . 'bugnote_add_inc.php' );
+		include( $t_mantis_dir . 'bugnote_view_inc.php' );
+	}
 
 	# History
 	if ( $f_history ) {