Bug: 14585 Fix saving sync prefs when no default resource exists.

horde · Mar 1, 2017 · 48a9ecb · 48a9ecb
1 parent b135c8c
commit 48a9ecb
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/config/prefs.php b/config/prefs.php
@@ -275,7 +275,11 @@
         $enum = array();
         $sync = @unserialize($GLOBALS['prefs']->getValue('sync_calendars'));
         if (empty($sync)) {
-            $GLOBALS['prefs']->setValue('sync_calendars', serialize(array(Kronolith::getDefaultCalendar())));
+            $default_calendar = Kronolith::getDefaultCalendar(Horde_Perms::EDIT);
+            $sync_list = !empty($default_calendar)
+                ? array($default_calendar)
+                : array();
+            $GLOBALS['prefs']->setValue('sync_calendars', serialize($sync_list));
         }
         foreach (Kronolith::listInternalCalendars(!$GLOBALS['prefs']->getValue('activesync_no_multiplex'), Horde_Perms::DELETE) as $key => $cal) {
             if ($cal->getName() != Kronolith::getDefaultCalendar(Horde_Perms::DELETE)) {
@@ -294,7 +298,7 @@
                 break;
             }
         }
-        if (!$haveDefault) {
+        if (!$haveDefault && !empty($default)) {
             $sync[] = $default;
             $GLOBALS['prefs']->setValue('sync_calendars', serialize($sync));
         }