From d92b083c1d50ac8fd763493add9bf947c1ca0267 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind1991@gmail.com>
Date: Wed, 11 Jan 2012 01:53:25 +0100
Subject: [PATCH] fix old calendar name and color not being preserved when
editing a calendar
---
apps/calendar/lib/calendar.php | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/apps/calendar/lib/calendar.php b/apps/calendar/lib/calendar.php
index ea60526a5b..4199ab5a7c 100644
--- a/apps/calendar/lib/calendar.php
+++ b/apps/calendar/lib/calendar.php
@@ -151,11 +151,11 @@ class OC_Calendar_Calendar{
$calendar = self::find($id);
// Keep old stuff
- if(is_null($name)) $name = $calendar['name'];
+ if(is_null($name)) $name = $calendar['displayname'];
if(is_null($components)) $components = $calendar['components'];
if(is_null($timezone)) $timezone = $calendar['timezone'];
if(is_null($order)) $order = $calendar['calendarorder'];
- if(is_null($color)) $color = $calendar['color'];
+ if(is_null($color)) $color = $calendar['calendarcolor'];
$stmt = OC_DB::prepare( 'UPDATE *PREFIX*calendar_calendars SET displayname=?,calendarorder=?,calendarcolor=?,timezone=?,components=?,ctag=ctag+1 WHERE id=?' );
$result = $stmt->execute(array($name,$order,$color,$timezone,$components,$id));
--
GitLab