Merge branch '2016.11' into 2016.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 30 Nov 2016 15:11:07 +0000 (16:11 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 30 Nov 2016 15:11:07 +0000 (16:11 +0100)
Change-Id: I1d39586d66015235f2b1eaadd61cb5d12dab9079

1  2 
tine20/Filemanager/js/NodeTreePanel.js
tine20/Phone/Setup/Update/Release9.php

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