From bdc5e5a6c088104e19c6567577e024db5069c7c4 Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Tue, 21 Feb 2012 20:51:52 +0000 Subject: [PATCH] Monotone-Parent: ed35a0aec1eed0f78e69e747bdd6871d62118111 Monotone-Revision: 64241052c164949118642194441e9a30cbdc3d58 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2012-02-21T20:51:52 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 5 +++++ SoObjects/SOGo/SOGoSQLUserProfile.m | 7 +------ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 05b3db453..34a900d49 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2012-02-21 Wolfgang Sourdeau + * SoObjects/SOGo/SOGoSQLUserProfile.m (-fetchJSONProfileFromDB): + removed an escaping hack for Oracle that should no longer be + required after the recent fixes in the Oracle adaptor, and which + was causing bad unescaping of double-escaped backslashes. + * Tests/Unit/TestSBJsonParser.m (-test_parseJSONString): added a line for escaped characters. diff --git a/SoObjects/SOGo/SOGoSQLUserProfile.m b/SoObjects/SOGo/SOGoSQLUserProfile.m index 1335e1496..5172896a7 100644 --- a/SoObjects/SOGo/SOGoSQLUserProfile.m +++ b/SoObjects/SOGo/SOGoSQLUserProfile.m @@ -134,12 +134,7 @@ static EOAttribute *textColumn = nil; defFlags.isNew = (row == nil); value = [row objectForKey: fieldName]; - if ([value isNotNull]) - /* The following enables the restitution of coded unicode (\U1234) - characters with the Oracle adaptor. */ - value = [value stringByReplacingString: @"\\\\" - withString: @"\\"]; - else + if (![value isNotNull]) value = nil; /* we discard any NSNull instance */ }