From 4df3295cce54221f6110baf354fc5479cddd8165 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Thu, 7 Mar 2013 15:55:40 +0000
Subject: [PATCH] * CalDAV/InfoLog: fixed SQL error if client has multiple
 identical X-properties, eg. alarms

---
 infolog/inc/class.infolog_so.inc.php | 2 +-
 infolog/templates/default/edit.xet   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/infolog/inc/class.infolog_so.inc.php b/infolog/inc/class.infolog_so.inc.php
index cdfd52b174..d01f911177 100644
--- a/infolog/inc/class.infolog_so.inc.php
+++ b/infolog/inc/class.infolog_so.inc.php
@@ -599,7 +599,7 @@ class infolog_so
 			if ($val)
 			{
 				$this->db->insert($this->extra_table,array(
-						'info_extra_value'=>$val
+						'info_extra_value'	=> is_array($val) ? serialize($val) : $val,
 					),array(
 						'info_id'			=> $info_id,
 						'info_extra_name'	=> substr($key,1),
diff --git a/infolog/templates/default/edit.xet b/infolog/templates/default/edit.xet
index 1733ea4d16..bc779cc381 100644
--- a/infolog/templates/default/edit.xet
+++ b/infolog/templates/default/edit.xet
@@ -270,7 +270,7 @@
 					<description/>
 					<description/>
 					<description value="Last modified"/>
-					<vbox options="0" orient="0">
+					<vbox options="0">
 						<menulist>
 							<menupopup type="select-account" id="info_modifier" readonly="true"/>
 						</menulist>