Porting #5258 - Issues upgrading thold

Warnings occur when installing thold plugin and as such thold will not upgrade correctly
Cacti · Apr 1, 2023 · e0c60ad · e0c60ad
1 parent 7f1382f
commit e0c60ad
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/CHANGELOG b/CHANGELOG
@@ -59,6 +59,7 @@ Cacti CHANGELOG
 
 1.2.25
 -issue#5254: Created a data source template to specify the snmp port, but it doesn't seem to work properly
+-issue#5258: Warnings occur when installing thold plugin and as such thold will not upgrade correctly
 -issue#5275: Boost stats can display odd values when running
 -issue#5277: Boost should not attempt to start if there are no poller_output_boost records
 -issue#5279: Rebuild poller cache does not work as expected

diff --git a/lib/plugins.php b/lib/plugins.php
@@ -1073,7 +1073,7 @@ function api_plugin_valid_entrypoint($plugin, $function) {
 	// Check for invalid entrypoint install/upgrade
 	$backtrace = debug_backtrace();
 	if (cacti_sizeof($backtrace)) {
-		if (!preg_match('/(install|upgrade)/i', $backtrace[2]['function'])) {
+		if (!preg_match('/(install|upgrade|setup)/i', $backtrace[2]['function'])) {
 			cacti_log(sprintf('WARNING: Plugin \'%s\' is attempting to call \'%s\' improperly in function \'%s\'', $plugin, $function, $backtrace[2]['function']), false, 'PLUGIN');
 			return false;
 		}