summaryrefslogtreecommitdiffstats
path: root/apps/calendar/lib
diff options
context:
space:
mode:
authorGeorg Ehrke <ownclouddev@georgswebsite.de>2011-11-12 15:09:37 +0100
committerGeorg Ehrke <ownclouddev@georgswebsite.de>2011-11-12 15:09:37 +0100
commite5a3ab8aad0b0deb312a97acb3fc808b497b0544 (patch)
tree5f7074a651b979cd0c9659de3f8d3fb6066fa37b /apps/calendar/lib
parent03d9fab3c0cf3a3c50259d6a33439a998628b45c (diff)
parentef124c3e21ceae49f0f704589a833d1208d99c65 (diff)
downloadnextcloud-server-e5a3ab8aad0b0deb312a97acb3fc808b497b0544.tar.gz
nextcloud-server-e5a3ab8aad0b0deb312a97acb3fc808b497b0544.zip
Merge branch 'master' into fullcalendar
Diffstat (limited to 'apps/calendar/lib')
-rw-r--r--apps/calendar/lib/calendar.php4
-rw-r--r--apps/calendar/lib/object.php4
2 files changed, 4 insertions, 4 deletions
diff --git a/apps/calendar/lib/calendar.php b/apps/calendar/lib/calendar.php
index 252ea66555c..3db4398096e 100644
--- a/apps/calendar/lib/calendar.php
+++ b/apps/calendar/lib/calendar.php
@@ -111,7 +111,7 @@ class OC_Calendar_Calendar{
$stmt = OC_DB::prepare( 'INSERT INTO *PREFIX*calendar_calendars (userid,displayname,uri,ctag,calendarorder,calendarcolor,timezone,components) VALUES(?,?,?,?,?,?,?,?)' );
$result = $stmt->execute(array($userid,$name,$uri,1,$order,$color,$timezone,$components));
- return OC_DB::insertid();
+ return OC_DB::insertid('*PREFIX*calendar_calendar');
}
/**
@@ -131,7 +131,7 @@ class OC_Calendar_Calendar{
$stmt = OC_DB::prepare( 'INSERT INTO *PREFIX*calendar_calendars (userid,displayname,uri,ctag,calendarorder,calendarcolor,timezone,components) VALUES(?,?,?,?,?,?,?,?)' );
$result = $stmt->execute(array($userid,$name,$uri,1,$order,$color,$timezone,$components));
- return OC_DB::insertid();
+ return OC_DB::insertid('*PREFIX*calendar_calendars');
}
/**
diff --git a/apps/calendar/lib/object.php b/apps/calendar/lib/object.php
index 221df2b3af0..ccc62d565e8 100644
--- a/apps/calendar/lib/object.php
+++ b/apps/calendar/lib/object.php
@@ -106,7 +106,7 @@ class OC_Calendar_Object{
OC_Calendar_Calendar::touchCalendar($id);
- return OC_DB::insertid();
+ return OC_DB::insertid('*PREFIX*calendar_objects');
}
/**
@@ -125,7 +125,7 @@ class OC_Calendar_Object{
OC_Calendar_Calendar::touchCalendar($id);
- return OC_DB::insertid();
+ return OC_DB::insertid('*PREFIX*calendar_objects');
}
/**