Skip to content
This repository was archived by the owner on Nov 25, 2020. It is now read-only.

Commit 3bd71b9

Browse files
committed
Fix array_merge case
1 parent 469fdbe commit 3bd71b9

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

core/src/plugins/access.ajxp_conf/class.ajxp_confAccessDriver.php

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1646,7 +1646,11 @@ public function switchAction($action, $httpVars, $fileVars)
16461646
$allParams = str_replace("</server_settings>", $addParams."</server_settings>", $allParams);
16471647

16481648
echo($allParams);
1649-
$definitions = $ajxpPlugin->getConfigsDefinitions() + $instancesDefinitions;
1649+
$definitions = $instancesDefinitions;
1650+
$configsDefs = $ajxpPlugin->getConfigsDefinitions();
1651+
if(is_array($configsDefs)){
1652+
$definitions = array_merge($configsDefs, $instancesDefinitions);
1653+
}
16501654
$values = $ajxpPlugin->getConfigs();
16511655
if(!is_array($values)) $values = array();
16521656
echo("<plugin_settings_values>");

0 commit comments

Comments
 (0)