Merge branch 'master-2.23'

mantisbt · Jan 22, 2020 · 26ad5e5 · 26ad5e5
2 parents 83640b9 + 9bb87b0
commit 26ad5e5
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 15 deletions.
diff --git a/bug_view_inc.php b/bug_view_inc.php
@@ -106,18 +106,6 @@
 
 $t_bugslist = gpc_get_cookie( config_get_global( 'bug_list_cookie' ), false );
 
-if( $t_flags['history_show'] ) {
-	if( $f_history ) {
-		$t_history_link = '#history';
-		$t_history_label = lang_get( 'jump_to_history' );
-	} else {
-		$t_history_link = 'view.php?id=' . $f_issue_id . '&history=1#history';
-		$t_history_label = lang_get( 'display_history' );
-	}
-} else {
-	$t_history_link = '';
-}
-
 $t_top_buttons_enabled = !$t_force_readonly && ( $t_action_button_position == POSITION_TOP || $t_action_button_position == POSITION_BOTH );
 $t_bottom_buttons_enabled = !$t_force_readonly && ( $t_action_button_position == POSITION_BOTTOM || $t_action_button_position == POSITION_BOTH );
 
@@ -169,7 +157,14 @@
 print_small_button( '#bugnotes', lang_get( 'jump_to_bugnotes' ) );
 
 # Display or Jump to History
-if( !is_blank( $t_history_link ) ) {
+if( $t_flags['history_show'] ) {
+	if( $f_history ) {
+		$t_history_link = '#history';
+		$t_history_label = lang_get( 'jump_to_history' );
+	} else {
+		$t_history_link = 'view.php?id=' . $f_issue_id . '&history=1#history';
+		$t_history_label = lang_get( 'display_history' );
+	}
 	print_small_button( $t_history_link, $t_history_label );
 }
 
@@ -733,7 +728,7 @@
 }
 
 # History
-if( $t_flags['history_show'] ) {
+if( $t_flags['history_show'] && $f_history ) {
 ?>
 	<div class="col-md-12 col-xs-12">
 		<a id="history"></a>

diff --git a/core/commands/IssueViewPageCommand.php b/core/commands/IssueViewPageCommand.php
@@ -138,7 +138,6 @@ protected function process() {
 		}
 
 		$t_flags['history_show'] =
-			config_get( 'history_default_visible' ) &&
 			access_has_bug_level( config_get( 'view_history_threshold' ), $t_issue_id );
 
 		$t_flags['reminder_can_add'] =