Merge branch 'B12484ConfigRenderBothToSingle' into 'develop'

B12484 config render both to single

See merge request !378

Makefile

@@ -10,7 +10,7 @@ GIT_REVISION_LONG = $(shell git rev-parse HEAD || true)
 
 VAR_TMP=/var/tmp/qfq_$(USER)
 
-EXTENSION_CONTENT = Classes Configuration Resources ext_emconf.php ext_localconf.php ext_tables.php ext_icon.png ext_conf_template.txt config-example.qfq.php RELEASE.txt vendor
+EXTENSION_CONTENT = Classes Configuration Resources ext_emconf.php ext_localconf.php ext_tables.php ext_icon.png ext_conf_template.txt example.qfq.json RELEASE.txt vendor
 
 DISTDIR=dist
 

extension/Classes/Core/Database/DatabaseUpdate.php

@@ -212,8 +212,9 @@ class DatabaseUpdate {
      */
     private function checkT3QfqConfig($old, $new) {
 
-        if ($new == $old) {
+        if ($new == $old || $old===false ) {
             return;
+
         }
 
         if (version_compare($old, '20.2.0') == -1) {