Merge branch '2013.10' into 2014.09
authorPhilipp Schüle <p.schuele@metaways.de>
Fri, 31 Oct 2014 10:53:04 +0000 (11:53 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Fri, 31 Oct 2014 10:53:04 +0000 (11:53 +0100)
Conflicts:
tine20/Calendar/Frontend/WebDAV.php

Change-Id: I89a0fddc04ee0c60386275f7f2e0908a06bb0a93

1  2 
tine20/Calendar/Frontend/WebDAV.php
tine20/Calendar/js/Model.js
tine20/Tinebase/js/ApplicationStarter.js

@@@ -77,8 -77,8 +77,8 @@@ class Calendar_Frontend_WebDAV extends 
          $children = parent::getChildren();
          
          // do this only for caldav request 
-         if ($this->_useIdAsName && count($this->_getPathParts()) == 2) {
+         if ($this->_useIdAsName && count($this->_getPathParts()) == 2 && Tinebase_Core::getUser()->hasRight('Tasks', Tinebase_Acl_Rights::RUN)) {
 -            $tfwdavct = new Tasks_Frontend_WebDAV('tasks/' . array_value(1, $this->_getPathParts()), $this->_useIdAsName);
 +            $tfwdavct = new Tasks_Frontend_WebDAV('tasks/' . Tinebase_Helper::array_value(1, $this->_getPathParts()), $this->_useIdAsName);
              
              $children = array_merge($children, $tfwdavct->getChildren());
          }
Simple merge