From 2542d351cb948931eb7c9f4aa4a155a4ec4b71b4 Mon Sep 17 00:00:00 2001
From: Andrew McMillan <andrew@morphoss.com>
Date: Wed, 4 Apr 2012 12:06:17 +1200
Subject: [PATCH] A better way of achieving that last commit is to add a third
 parameter.

---
 inc/caldav-client-v2.php | 32 ++------------------------------
 1 file changed, 2 insertions(+), 30 deletions(-)

diff --git a/inc/caldav-client-v2.php b/inc/caldav-client-v2.php
index 42732e43..c54a7a07 100644
--- a/inc/caldav-client-v2.php
+++ b/inc/caldav-client-v2.php
@@ -928,41 +928,13 @@ EOFILTER;
   *
   * @return array An array of the relative URL, etag, and calendar data returned from DoCalendarQuery() @see DoCalendarQuery()
   */
-  function GetEntryByUid( $uid, $relative_url = '' ) {
+  function GetEntryByUid( $uid, $relative_url = '', $component_type = 'VEVENT' ) {
     $filter = "";
     if ( $uid ) {
       $filter = <<<EOFILTER
   <C:filter>
     <C:comp-filter name="VCALENDAR">
-          <C:comp-filter name="VEVENT">
-                <C:prop-filter name="UID">
-                        <C:text-match icollation="i;octet">$uid</C:text-match>
-                </C:prop-filter>
-          </C:comp-filter>
-    </C:comp-filter>
-  </C:filter>
-EOFILTER;
-    }
-
-    return $this->DoCalendarQuery($filter, $relative_url);
-  }
-
-
-  /**
-  * Get the calendar entry by UID
-  *
-  * @param uid
-  * @param string    $relative_url The URL relative to the base_url specified when the calendar was opened.  Default ''.
-  *
-  * @return array An array of the relative URL, etag, and calendar data returned from DoCalendarQuery() @see DoCalendarQuery()
-  */
-  function GetTodoByUid( $uid, $relative_url = '' ) {
-    $filter = "";
-    if ( $uid ) {
-      $filter = <<<EOFILTER
-  <C:filter>
-    <C:comp-filter name="VCALENDAR">
-          <C:comp-filter name="VTODO">
+          <C:comp-filter name="$component_type">
                 <C:prop-filter name="UID">
                         <C:text-match icollation="i;octet">$uid</C:text-match>
                 </C:prop-filter>
-- 
2.11.4.GIT