Merge branch '2016.11' into 2016.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 14 Dec 2016 14:57:04 +0000 (15:57 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 14 Dec 2016 14:57:04 +0000 (15:57 +0100)
1  2 
tine20/Calendar/Controller/EventNotifications.php
tine20/Felamimail/Controller/Account.php
tine20/Phone/Setup/Update/Release9.php
tine20/Setup/Controller.php
tine20/Tinebase/js/common.js

@@@ -46,17 -46,18 +46,18 @@@ class Phone_Setup_Update_Release9 exten
              $relationBackend->purgeRelationsByType('CALLER');
          }
  
-         $declaration = new Setup_Backend_Schema_Field_Xml('
-             <field>
-                 <name>contact_id</name>
-                 <type>text</type>
-                 <length>40</length>
-             </field>');
-         $this->_backend->addCol('phone_callhistory', $declaration);
-         $this->setTableVersion('phone_callhistory', 3);
+         if ($this->getTableVersion('phone_callhistory') < 3) {
+             $declaration = new Setup_Backend_Schema_Field_Xml('
+                 <field>
+                     <name>contact_id</name>
+                     <type>text</type>
+                     <length>40</length>
+                 </field>');
+             $this->_backend->addCol('phone_callhistory', $declaration);
+             $this->setTableVersion('phone_callhistory', 3);
+         }
  
 -        $setupUser = $this->_getSetupFromConfigOrCreateOnTheFly();
 +        $setupUser = self::getSetupFromConfigOrCreateOnTheFly();
  
          if ($setupUser) {
              Tinebase_Core::set(Tinebase_Core::USER, $setupUser);
Simple merge
Simple merge