Merge branch '2023.11' into 2024.11

tine-groupware · Jan 30, 2024 · b3c9613 · b3c9613
2 parents 90ffa1b + 2c07627
commit b3c9613
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/tine20/Tinebase/Setup/Update/15.php b/tine20/Tinebase/Setup/Update/15.php
@@ -853,15 +853,17 @@ public function update029()
     public function update030()
     {
         Tinebase_TransactionManager::getInstance()->rollBack();
-        if ($this->getTableVersion('accounts') < 19) {
+        if (! $this->_backend->columnExists('type', 'accounts')) {
             $this->_backend->addCol('accounts', new Setup_Backend_Schema_Field_Xml('
                 <field>
                     <name>type</name>
                     <type>text</type>
                     <length>64</length>
                     <notnull>false</notnull>
                 </field>'));
-            $this->setTableVersion('accounts', 19);
+            if ($this->getTableVersion('accounts') < 19) {
+                $this->setTableVersion('accounts', 19);
+            }
         }
         $this->addApplicationUpdate(Tinebase_Config::APP_NAME, '15.30', self::RELEASE015_UPDATE030);
     }