From ab1fdb0617b108d36f69c6cb2184002244f8231c Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Tue, 17 Jul 2012 12:15:10 +0000 Subject: [PATCH] * Addressbook: fixed error when adding a new organisation member for organisation(department)s containing a comma --- addressbook/inc/class.addressbook_ui.inc.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/addressbook/inc/class.addressbook_ui.inc.php b/addressbook/inc/class.addressbook_ui.inc.php index d7ffaaeef1..73ccc2ecf3 100644 --- a/addressbook/inc/class.addressbook_ui.inc.php +++ b/addressbook/inc/class.addressbook_ui.inc.php @@ -1688,9 +1688,12 @@ class addressbook_ui extends addressbook_bo { $state = egw_session::appsession('index','addressbook'); // check if we create the new contact in an existing org - if ($_GET['org']) + if (($org = $_GET['org'])) { - $content = $this->read_org($_GET['org']); + // arguments containing a comma get quoted by etemplate/js/nextmatch_action.js + // leading to error in egw_db::column_data_implode, if not unquoted + if ($org[0] == '"') $org = substr($org, 1, -1); + $content = $this->read_org($org); } elseif ($state['org_view'] && !isset($this->org_views[$state['org_view']])) {