Merge branch 'pu/2013.10-caldav' into 2014.09
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 16 Oct 2014 08:32:05 +0000 (10:32 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 16 Oct 2014 08:32:05 +0000 (10:32 +0200)
Conflicts:
tests/tine20/Calendar/TestCase.php

Change-Id: I1fcce68db0cb6299d646430488381d061799476e

1  2 
tests/tine20/Calendar/Frontend/WebDAV/EventTest.php
tests/tine20/Calendar/TestCase.php
tests/tine20/TestCase.php
tine20/Calendar/Controller/EventNotifications.php
tine20/Calendar/Convert/Event/VCalendar/Abstract.php
tine20/Tinebase/WebDav/Collection/AbstractContainerTree.php

Simple merge
Simple merge
@@@ -282,10 -282,10 +282,10 @@@ abstract class Tinebase_WebDav_Collecti
              # path == /<applicationPrefix>/<contactid>|'shared'
              # list container
              case 2:
 -                if (array_value(1, $this->_getPathParts()) == Tinebase_Model_Container::TYPE_SHARED) {
 +                if (Tinebase_Helper::array_value(1, $this->_getPathParts()) == Tinebase_Model_Container::TYPE_SHARED) {
                      $containers = Tinebase_Container::getInstance()->getSharedContainer(
                          Tinebase_Core::getUser(),
-                         $this->_getAppliationName(),
+                         $this->_getApplicationName(),
                          array(
                              Tinebase_Model_Grants::GRANT_READ,
                              Tinebase_Model_Grants::GRANT_SYNC
       * 
       * @return string
       */
-     protected function _getAppliationName()
+     protected function _getApplicationName()
      {
          if (!$this->_applicationName) {
 -            $this->_applicationName = array_value(0, explode('_', get_class($this)));
 +            $this->_applicationName = Tinebase_Helper::array_value(0, explode('_', get_class($this)));
          }
          
          return $this->_applicationName;