Resolving Issue #2702

sqltable_to_php.php should ignore '--plugin' when '--update'
Cacti · May 24, 2019 · ad50326 · ad50326
1 parent 8845109
commit ad50326
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/CHANGELOG b/CHANGELOG
@@ -38,6 +38,7 @@ Cacti CHANGELOG
 -issue#2693: Graph links do not contain proper URL path causing links to fail
 -issue#2698: Avoid duplicated icon in the main.js of all themes
 -issue#2699: Login Options: "Show the page that user pointed their browser to" Not Working
+-issue#2702: sqltable_to_php.php should ignore '--plugin' when '--update'
 -feature#2538: New global setting to change datasource behaviour when deleting graph
 -feature#2539: New global setting to add permanent unlock of graphs
 -feature#2540: New user setting to forget graph tree history on tab close

diff --git a/cli/sqltable_to_php.php b/cli/sqltable_to_php.php
@@ -155,7 +155,7 @@ function sqltable_to_php($table, $create, $plugin = '') {
 			}
 
 			if (!empty($pri)) {
-				if ($plugin != '') {
+				if ($plugin != '' || !$create) {
 					$text .= "\$data['primary'] = '" . implode("`,`", $pri) . "';\n";
 				} else {
 					$text .= "\$data['primary'] = array('" . implode("','", $pri) . "');\n";