diff --git a/addressbook/templates/default/config.xet b/addressbook/templates/default/config.xet
index bbb9ca667a..fab92485ae 100644
--- a/addressbook/templates/default/config.xet
+++ b/addressbook/templates/default/config.xet
@@ -39,9 +39,9 @@
-
+
diff --git a/api/src/Contacts.php b/api/src/Contacts.php
index 77aa84ae6e..7f3f2067b4 100755
--- a/api/src/Contacts.php
+++ b/api/src/Contacts.php
@@ -1794,9 +1794,8 @@ class Contacts extends Contacts\Storage
*/
function read_calendar($uids,$extra_title=true)
{
- if (!$GLOBALS['egw_info']['user']['apps']['calendar'] ||
- $GLOBALS['egw_info']['server']['disable_event_column'] == 'True'
- )
+ if (empty($GLOBALS['egw_info']['user']['apps']['calendar']) ||
+ $GLOBALS['egw_info']['server']['disable_event_column'] == 'True')
{
return array();
}
@@ -1807,7 +1806,7 @@ class Contacts extends Contacts\Storage
foreach($uids as $id => $uid)
{
$type = is_numeric($uid[0]) ? 'u' : $uid[0];
- if($GLOBALS['egw_info']['server']['disable_event_column'] == 'contacts' && $type == 'u')
+ if($GLOBALS['egw_info']['server']['disable_event_column'] !== 'false' && $type === 'u')
{
continue;
}