Merge branch '2013.10' into 2014.09
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 3 Dec 2014 13:09:24 +0000 (14:09 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 3 Dec 2014 13:09:24 +0000 (14:09 +0100)
1  2 
tine20/Calendar/Convert/Event/VCalendar/Factory.php
tine20/HumanResources/Setup/Update/Release7.php
tine20/Tinebase/Record/RecordSet.php
tine20/Voipmanager/Setup/setup.xml

@@@ -23,9 -23,15 +23,16 @@@ class Calendar_Convert_Event_VCalendar_
      const CLIENT_MACOSX      = 'macosx';
      const CLIENT_THUNDERBIRD = 'thunderbird';
      const CLIENT_EMCLIENT    = 'emclient';
 +    const CLIENT_TINE        = 'tine';
      
      /**
+      * cache parsed user-agent strings
+      * 
+      * @var array
+      */
+     static protected $_parsedUserAgentCache = array();
+     
+     /**
       * factory function to return a selected vcalendar backend class
       *
       * @param   string $_backend
Simple merge
Simple merge