Merge branch '2016.11' into 2016.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Tue, 20 Jun 2017 13:21:34 +0000 (15:21 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Tue, 20 Jun 2017 13:21:34 +0000 (15:21 +0200)
Change-Id: I3b2badf8ef8efbc0e4744e9d134317e72c6577a0

1  2 
tine20/Addressbook/Controller/Contact.php

@@@ -906,13 -639,12 +906,18 @@@ class Addressbook_Controller_Contact ex
          // fetch all groups and role memberships and add to path
          $listIds = Addressbook_Controller_List::getInstance()->getMemberships($record);
          foreach ($listIds as $listId) {
-             /** @var Addressbook_Model_List $list */
-             $list = Addressbook_Controller_List::getInstance()->get($listId);
+             try {
++                /** @var Addressbook_Model_List $list */
+                 $list = Addressbook_Controller_List::getInstance()->get($listId);
+             } catch (Tinebase_Exception_AccessDenied $tead) {
+                 Tinebase_Exception::log($tead);
+                 continue;
+             }
 +
 +            /**
 +             * TODO
 +             * what if this would return the $list->memberroles paths too? we would double create them!
 +             */
              $listPaths = $this->_getPathsOfRecord($list);
              if (count($listPaths) === 0) {
                  // add self