From d852838c7e599ffee21ec042d6a685b6603d4713 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <machniak@kolabsys.com>
Date: Wed, 24 Apr 2019 10:16:12 +0200
Subject: [PATCH] Fix " v is null in set_event_colors()" error

---
 plugins/calendar/calendar_ui.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/calendar/calendar_ui.js b/plugins/calendar/calendar_ui.js
index 98ef6665..5bfaf3f3 100644
--- a/plugins/calendar/calendar_ui.js
+++ b/plugins/calendar/calendar_ui.js
@@ -317,7 +317,7 @@ function rcube_calendar_ui(settings)
       if (String(css['border-color']).match(/^#?f+$/i))
         delete css['border-color'];
 
-      $.each(css, function(i, v) { if (!v) delete css[i]; if (v.charAt(0) != '#') css[i] = '#' + v; });
+      $.each(css, function(i, v) { if (!v) delete css[i]; else if (v.charAt(0) != '#') css[i] = '#' + v; });
 
       if (mode == 'list') {
         bg_color = css['background-color'];