Take a stab in the dark at AgenDAV v2.1.0 support.

[mailshears.git] / lib / common / agendav_plugin.rb

diff --git a/lib/common/agendav_plugin.rb b/lib/common/agendav_plugin.rb
index 49e7087d996ce2de850a01ec3c6d0a785b0ecd06..4c3a5cff3bc4a1acef6270a8de55ce7d800f5a8d 100644 (file)
--- a/lib/common/agendav_plugin.rb
+++ b/lib/common/agendav_plugin.rb
@@ -35,9 +35,11 @@ module AgendavPlugin
 
     connection = PG::Connection.new(@db_hash)
 
-    sql_query  = '(SELECT username FROM prefs)'
-    sql_query += 'UNION'
-    sql_query += '(SELECT user_from FROM shared);'
+    # There's also an "owner" field in the "shares" table, but it
+    # contains a principal URL and not a bare username. Thus its
+    # format depends on the CalDAV server configuration, and isn't
+    # predictable.
+    sql_query  = 'SELECT username FROM prefs'
 
     begin
       connection.query(sql_query) do |result|