Merge branch 'master-2.24'

mantisbt · Apr 3, 2020 · cbfd737 · cbfd737
2 parents 85d6684 + 76fa47a
commit cbfd737
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/bug_view_inc.php b/bug_view_inc.php
@@ -423,7 +423,7 @@
 
 if( ( $t_flags['profiles_platform_show'] && isset( $t_issue['platform'] ) && !is_blank( $t_issue['platform'] ) ) ||
 	( $t_flags['profiles_os_show'] && isset( $t_issue['os'] ) && !is_blank( $t_issue['os'] ) ) ||
-    ( $t_flags['profiles_os_version_show'] && isset( $t_issue['os_version'] ) && !is_blank( $t_issue['os_version'] ) ) ) {
+    ( $t_flags['profiles_os_build_show'] && isset( $t_issue['os_build'] ) && !is_blank( $t_issue['os_build'] ) ) ) {
 	$t_spacer = 0;
 
 	echo '<tr>';
@@ -445,9 +445,9 @@
 	}
 
 	# OS Version
-	if( $t_flags['profiles_os_version_show'] && isset( $t_issue['os_version'] ) && !is_blank( $t_issue['os_version'] ) ) {
+	if( $t_flags['profiles_os_build_show'] && isset( $t_issue['os_build'] ) && !is_blank( $t_issue['os_build'] ) ) {
 		echo '<th class="bug-os-version category">', lang_get( 'os_version' ), '</th>';
-		echo '<td class="bug-os-version">', string_display_line( $t_issue['os_version'] ), '</td>';
+		echo '<td class="bug-os-version">', string_display_line( $t_issue['os_build'] ), '</td>';
 	} else {
 		$t_spacer += 2;
 	}

diff --git a/config_defaults_inc.php b/config_defaults_inc.php
@@ -2500,7 +2500,7 @@
 	'id',
 	'last_updated',
 	'os',
-	'os_version',
+	'os_build',
 	'platform',
 	'priority',
 	'product_build',

diff --git a/core/commands/IssueViewPageCommand.php b/core/commands/IssueViewPageCommand.php
@@ -204,7 +204,7 @@ protected function process() {
 		$t_flags['profiles_show'] = config_get( 'enable_profiles' ) != OFF;
 		$t_flags['profiles_platform_show'] = $t_flags['profiles_show'] && in_array( 'platform', $t_fields );
 		$t_flags['profiles_os_show'] = $t_flags['profiles_show'] && in_array( 'os', $t_fields );
-		$t_flags['profiles_os_version_show'] = $t_flags['profiles_show'] && in_array( 'os_version', $t_fields );
+		$t_flags['profiles_os_build_show'] = $t_flags['profiles_show'] && in_array( 'os_build', $t_fields );
 
 		$t_flags['monitor_show'] =
 			!$t_force_readonly &&