From c2f19754995195361c14ceb4c972aeedd767ecf2 Mon Sep 17 00:00:00 2001
From: Stefan Schlott <stefan@ploing.de>
Date: Thu, 19 Feb 2015 23:01:23 +0100
Subject: [PATCH] Refine date comparison (timezones)

---
 lib/eventhelpers.rb | 2 +-
 lib/eventlists.rb   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/eventhelpers.rb b/lib/eventhelpers.rb
index 505b14f6..0112f123 100644
--- a/lib/eventhelpers.rb
+++ b/lib/eventhelpers.rb
@@ -50,7 +50,7 @@ def calculate_to_dates()
 end
 
 def conv_tz(t)
-  if (t.utc?)
+  if (t && t.class.method_defined?(:utc) && t.utc?)
     Time.local(t.year, t.month, t.day, t.hour, t.min, t.sec)
   else
     t
diff --git a/lib/eventlists.rb b/lib/eventlists.rb
index 274e3036..55b6c423 100644
--- a/lib/eventlists.rb
+++ b/lib/eventlists.rb
@@ -1,6 +1,6 @@
 def expand_event_list(itemId, defaultTitle = nil, skipIfDatePresent = false)
   @items[itemId][:events].each_with_index do |event,n|
-    if (!skipIfDatePresent || !@items.any?{ |i| i[:startdate]==event[:startdate] })
+    if (!skipIfDatePresent || !@items.any?{ |i| conv_tz(i[:startdate])==conv_tz(event[:startdate]) })
       metadata = {
         :title => defaultTitle,
         :public => true