lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-15 09:04:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

MVC, php union operator seems to be bugggy, closes https://github.com/opnsense/core/pull/3301

Browse Source
This commit is contained in:
Ad Schellevis 2019-03-11 09:25:51 +01:00
parent fbf5bf723c
commit 3cff50bc2f
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/opnsense/mvc/app/models/OPNsense/Base/FieldTypes/ModelRelationField.php
View File

@ -211,7 +211,12 @@ class ModelRelationField extends BaseField
$datanodes = explode(',', $this->internalValue);
if ($this->internalIsSorted) {
$optKeys = $datanodes + array_keys(self::$internalOptionList[$this->internalCacheKey]);
$optKeys = $datanodes;
foreach (array_keys(self::$internalOptionList[$this->internalCacheKey]) as $key) {
if (!in_array($key, $optKeys)) {
$optKeys[] = $key;
}
}
} else {
$optKeys = array_keys(self::$internalOptionList[$this->internalCacheKey]);
}