Fix an error in UpgradeHandler for fresh installs.

MetaModels · Oct 21, 2014 · d37da60 · d37da60
1 parent 5773f19
commit d37da60
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/src/MetaModels/Helper/UpgradeHandler.php b/src/MetaModels/Helper/UpgradeHandler.php
@@ -83,7 +83,9 @@ protected static function upgradeJumpTo()
     protected static function upgradeDcaSettingsPublished()
     {
         $objDB = self::DB();
-        if (!$objDB->fieldExists('published', 'tl_metamodel_dcasetting', true)) {
+        if (!($objDB->tableExists('tl_metamodel_dcasetting', null, true)
+            && $objDB->fieldExists('published', 'tl_metamodel_dcasetting', true))
+        ) {
             // Create the column in the database and copy the data over.
             TableManipulation::createColumn(
                 'tl_metamodel_dcasetting',
@@ -123,7 +125,9 @@ protected static function changeSubPalettesToConditions()
             );
         }
 
-        if ($objDB->fieldExists('subpalette', 'tl_metamodel_dcasetting', true)) {
+        if (!($objDB->tableExists('tl_metamodel_dcasetting', null, true)
+            && $objDB->fieldExists('subpalette', 'tl_metamodel_dcasetting', true))
+        ) {
             $subpalettes = $objDB->execute('SELECT * FROM tl_metamodel_dcasetting WHERE subpalette!=0');
 
             if ($subpalettes->numRows) {