summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Bruederli <thomas@roundcube.net>2014-02-06 16:31:42 (GMT)
committerThomas Bruederli <thomas@roundcube.net>2014-02-10 13:17:36 (GMT)
commit4f80d31abe01bb39cf4712d3175a3e22684e14c4 (patch)
treeb975e4f5a01ba589497dd19d0191d229503f07d2
parent66898a8d6f17dc1b6ef150c552e49a5040144325 (diff)
downloadiRony-4f80d31abe01bb39cf4712d3175a3e22684e14c4.tar.gz
Adapt to kolab_storage_folder optimizations: don't cast resultset into array (#2827)
-rw-r--r--lib/Kolab/CalDAV/CalendarBackend.php4
-rw-r--r--lib/Kolab/CardDAV/ContactsBackend.php2
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/Kolab/CalDAV/CalendarBackend.php b/lib/Kolab/CalDAV/CalendarBackend.php
index d44f2aa..8f141f0 100644
--- a/lib/Kolab/CalDAV/CalendarBackend.php
+++ b/lib/Kolab/CalDAV/CalendarBackend.php
@@ -288,7 +288,7 @@ class CalendarBackend extends CalDAV\Backend\AbstractBackend
$events = array();
$storage = $this->get_storage_folder($calendarId);
if ($storage) {
- foreach ((array)$storage->select($query) as $event) {
+ foreach ($storage->select($query) as $event) {
$events[] = array(
'id' => $event['uid'],
'uri' => $event['uid'] . '.ics',
@@ -577,7 +577,7 @@ class CalendarBackend extends CalDAV\Backend\AbstractBackend
$results = array();
if ($storage = $this->get_storage_folder($calendarId)) {
- foreach ((array)$storage->select($query) as $event) {
+ foreach ($storage->select($query) as $event) {
// TODO: cache the already fetched events in memory (really?)
$results[] = $event['uid'] . '.ics';
}
diff --git a/lib/Kolab/CardDAV/ContactsBackend.php b/lib/Kolab/CardDAV/ContactsBackend.php
index 72850e5..f43edb5 100644
--- a/lib/Kolab/CardDAV/ContactsBackend.php
+++ b/lib/Kolab/CardDAV/ContactsBackend.php
@@ -269,7 +269,7 @@ class ContactsBackend extends CardDAV\Backend\AbstractBackend
$query = array(array('type', '=', $groups_support ? array('contact','distribution-list') : 'contact'));
$cards = array();
if ($storage = $this->get_storage_folder($addressBookId)) {
- foreach ((array)$storage->select($query) as $contact) {
+ foreach ($storage->select($query) as $contact) {
$cards[] = array(
'id' => $contact['uid'],
'uri' => $contact['uid'] . '.vcf',