From d08e886768cc27df7be2837a3184ece153b00333 Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Mon, 25 Jan 2021 10:37:46 +0100
Subject: [PATCH] Revert "mvc: do not migrate unversioned empty model data"

This partially reverts commit 6ed3e4fe8d4c15e3ec902baaed852a9237ff36ca.
---
 .../mvc/app/models/OPNsense/Base/BaseModel.php         | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/opnsense/mvc/app/models/OPNsense/Base/BaseModel.php b/src/opnsense/mvc/app/models/OPNsense/Base/BaseModel.php
index 983586344..6629c38a4 100644
--- a/src/opnsense/mvc/app/models/OPNsense/Base/BaseModel.php
+++ b/src/opnsense/mvc/app/models/OPNsense/Base/BaseModel.php
@@ -336,11 +336,10 @@ abstract class BaseModel
         $this->parseXml($model_xml->items, $config_array, $this->internalData);
         // root may contain a version, store if found
         if (empty($config_array)) {
-            $this->internal_current_model_version = null;
+            // new node, reset
+            $this->internal_current_model_version = "0.0.0";
         } elseif (!empty($config_array->attributes()['version'])) {
             $this->internal_current_model_version = (string)$config_array->attributes()['version'];
-        } else {
-            $this->internal_current_model_version = "0.0.0";
         }
 
         // trigger post loading event
@@ -630,10 +629,7 @@ abstract class BaseModel
      */
     public function runMigrations()
     {
-        if (
-            $this->internal_current_model_version !== null &&
-            version_compare($this->internal_current_model_version, $this->internal_model_version, '<')
-        ) {
+        if (version_compare($this->internal_current_model_version, $this->internal_model_version, '<')) {
             $upgradePerfomed = false;
             $migObjects = array();
             $logger = new Syslog("config", array('option' => LOG_PID, 'facility' => LOG_LOCAL2));