Monotone-Parent: ed35a0aec1eed0f78e69e747bdd6871d62118111

Monotone-Revision: 64241052c164949118642194441e9a30cbdc3d58

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-02-21T20:51:52
Monotone-Branch: ca.inverse.sogo

ChangeLog

@@ -1,5 +1,10 @@
 2012-02-21  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* 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.
 

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 */
         }