OpenVPN export, regression in configuredSetttings(), use collected presets when server settings aren't found. for https://github.com/opnsense/core/issues/2787

This commit is contained in:
Ad Schellevis 2018-11-20 20:23:48 +01:00
parent 9d782f5008
commit 0a0e5ee747

View File

@ -151,7 +151,7 @@ class ExportController extends ApiControllerBase
foreach ($serverModel->iterateItems() as $field => $value) {
if (!empty((string)$value)) {
$result[$field] = (string)$value;
} else {
} elseif (!empty((string)$server->$field) || !isset($result[$field])) {
$result[$field] = (string)$server->$field;
}
}