Fixing #4528 - Device Threads

Default Setting "Device Threads" is ignored in device creation form
Cacti · Jan 17, 2022 · 215aa31 · 215aa31
1 parent e17ef56
commit 215aa31
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,7 +1,7 @@
 Cacti CHANGELOG
 
 1.2.20
--security:   Resolve issues with SQL injections in user_admin and user_group_admin.  Thanks @enesdex 
+-security:   Resolve issues with SQL injections in user_admin and user_group_admin.  Thanks @enesdex
 -security:   Resolve issues with XSS issues in color_template.  Thanks @M0rphling
 -issue#3816: Installation can sometimes appear stuck during replication or table conversion
 -issue#4363: Duplicate entries in graph_templates_item - mabye an aftermath of the template edit bug
@@ -30,6 +30,7 @@ Cacti CHANGELOG
 -issue#4516: Unable to create Graphs due to one of the following Data Query Issues: permissions, incorrectly formatted, or missing XML file
 -issue#4519: Tracebacks and errors when remote host poll fails
 -issue#4522: When Creating New Graphs some visible 'Custom Input' values lack a table header
+-issue#4528: Default Setting "Device Threads" is ignored in device creation form
 
 1.2.19
 -security#4356: Further fixes for grave character security protection

diff --git a/include/global_arrays.php b/include/global_arrays.php
@@ -755,7 +755,7 @@
 );
 
 $device_threads = array(
-	1 => __('1 Thread (default)'),
+	1 => __('1 Thread'),
 	2 => __('%d Threads', 2),
 	3 => __('%d Threads', 3),
 	4 => __('%d Threads', 4),

diff --git a/include/global_form.php b/include/global_form.php
@@ -1237,7 +1237,7 @@
 		'friendly_name' => __('Number of Collection Threads'),
 		'description' => __('The number of concurrent threads to use for polling this device.  This applies to the Spine poller only.'),
 		'value' => '|arg1:device_threads|',
-		'default' => '1',
+		'default' => read_config_option('device_threads'),
 		'array' => $device_threads
 		),
 	'disabled' => array(