From 5799804274c178c846f50c2aa8f405feeac26ec3 Mon Sep 17 00:00:00 2001 From: Ludovic Marcotte Date: Thu, 29 Dec 2011 12:24:43 +0000 Subject: [PATCH] See ChangeLog Monotone-Parent: 00dcc1dc8b8b274e7cf85d53a4fa495b97e1c52c Monotone-Revision: a4f6c377a41454eb21ed5b253cb7d07fc2c1a55e Monotone-Author: ludovic@Sophos.ca Monotone-Date: 2011-12-29T12:24:43 --- ChangeLog | 6 ++++++ SoObjects/SOGo/SOGoSQLUserProfile.m | 1 - 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index c554ed6d9..9cec3647b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2011-12-29 Ludovic Marcotte + + * SoObjects/SOGo/SOGoSQLUserProfile.m (_sqlJsonRepresentation:): + don't escape the / character as it's generating invalid JSON + output on newer versions of PostgreSQL. + 2011-12-23 Francis Lachapelle * UI/Scheduler/UIxAppointmentEditor.m (-viewAction): the end diff --git a/SoObjects/SOGo/SOGoSQLUserProfile.m b/SoObjects/SOGo/SOGoSQLUserProfile.m index fe51966fd..4f571d92c 100644 --- a/SoObjects/SOGo/SOGoSQLUserProfile.m +++ b/SoObjects/SOGo/SOGoSQLUserProfile.m @@ -145,7 +145,6 @@ static NSString *uidColumnName = @"c_uid"; sql = [jsonRepresentation mutableCopy]; [sql autorelease]; - [sql replaceString: @"\\" withString: @"\\\\"]; [sql replaceString: @"'" withString: @"''"]; return sql;