From 90f2fcd294e6af14346e6f5ee3d38c5f06a922b4 Mon Sep 17 00:00:00 2001
From: Andrew McMillan <debian@mcmillan.net.nz>
Date: Thu, 9 Aug 2007 18:14:38 +1200
Subject: [PATCH] Add missing parameters to rollback-on-error calls.

---
 inc/caldav-PUT-functions.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/inc/caldav-PUT-functions.php b/inc/caldav-PUT-functions.php
index 87887011..34df4264 100644
--- a/inc/caldav-PUT-functions.php
+++ b/inc/caldav-PUT-functions.php
@@ -132,7 +132,7 @@ function import_collection($ics_content, $user_no, $path,$context){
     }
   }
   $qry = new PgQuery("BEGIN; DELETE FROM calendar_item WHERE user_no=? AND dav_name ~ ?; DELETE FROM caldav_data WHERE user_no=? AND dav_name ~ ?;", $user_no, $path.'[^/]+$', $user_no, $path.'[^/]+$');
-  if ( !$qry->Exec("PUT") ) rollback_on_error();
+  if ( !$qry->Exec("PUT") ) rollback_on_error($context,$user_no,$path);
 
   foreach( $events AS $k => $event ) {
     dbg_error_log( "PUT", "Putting event %d with data: %s", $k, $event['data'] );
@@ -142,7 +142,7 @@ function import_collection($ics_content, $user_no, $path,$context){
     $event_path = sprintf( "%s%d.ics", $path, $k);
     $qry = new PgQuery( "INSERT INTO caldav_data ( user_no, dav_name, dav_etag, caldav_data, caldav_type, logged_user, created, modified ) VALUES( ?, ?, ?, ?, ?, ?, current_timestamp, current_timestamp )",
                           $user_no, $event_path, $etag, $icalendar, $ic->type, $session->user_no );
-    if ( !$qry->Exec("PUT") ) rollback_on_error();
+    if ( !$qry->Exec("PUT") ) rollback_on_error($context,$user_no,$path);
 
     $sql = "";
     if ( preg_match(':^(Africa|America|Antarctica|Arctic|Asia|Atlantic|Australia|Brazil|Canada|Chile|Etc|Europe|Indian|Mexico|Mideast|Pacific|US)/[a-z]+$:i', $ic->tz_locn ) ) {