From 0003a93c1137dbf806b5c716146b455169eb4b83 Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Wed, 28 Sep 2011 09:48:47 +0000 Subject: [PATCH] * CardDAV/GroupDAV/Addressbook: do NOT check for api version, as it caused accounts created during setup to have no carddav_name and therefore fail in CardDAV/GroupDAV (shown as "/addressbook/" in collection list!) --- addressbook/inc/class.addressbook_sql.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addressbook/inc/class.addressbook_sql.inc.php b/addressbook/inc/class.addressbook_sql.inc.php index ffcaf041e9..6b8b779548 100644 --- a/addressbook/inc/class.addressbook_sql.inc.php +++ b/addressbook/inc/class.addressbook_sql.inc.php @@ -656,7 +656,7 @@ class addressbook_sql extends so_sql_cf //echo "

set uid={$this->data['uid']}, etag={$this->data['etag']}

"; } // set carddav_name, if not given by caller - if (empty($this->data['carddav_name']) && version_compare($GLOBALS['egw_info']['apps']['phpgwapi']['version'], '1.9.007', '>=')) + if (empty($this->data['carddav_name'])) { $update['carddav_name'] = $this->data['id'].'.vcf'; }