diff --git a/application/Pop/Pop.php b/application/Pop/Pop.php index d242218dc..b877eb907 100644 --- a/application/Pop/Pop.php +++ b/application/Pop/Pop.php @@ -1,6 +1,8 @@ gps_lat; $data['gps_long'] = $r->gps_long; $data['location'] = $r->location; - $data['vlan_public'] = $r->vlan_public; - $data['vlan_nat'] = $r->vlan_nat; - $data['vlan_ipv6'] = $r->vlan_ipv6; + $data['vlan_public'] = ($r->vlan_public) ? $r->vlan_public : null; + $data['vlan_nat'] = ($r->vlan_nat) ? $r->vlan_nat: null; + $data['vlan_ipv6'] = ($r->vlan_ipv6) ? $r->vlan_ipv6: null; $data['note'] = $r->note; $data['edit_by'] = 1; diff --git a/application/Pop/PopModel.php b/application/Pop/PopModel.php index bc9a8bf7a..5bf80e365 100644 --- a/application/Pop/PopModel.php +++ b/application/Pop/PopModel.php @@ -26,7 +26,11 @@ class PopModel { foreach($data as $field => $value) { if(property_exists(get_called_class(), $field)) { - $model ->$field = $value; + if(substr($field, 0, 5) == "vlan_" && !$value) { + $model->$field = null; + continue; + } + $model->$field = $value; } }