From 5cdefc8a8bc30adb12b2d9da561abd88c9c68226 Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Thu, 11 Mar 2010 22:32:47 +0000 Subject: [PATCH] Monotone-Parent: ae2731aedf2ba81e571b426efe36751b90702b6b Monotone-Revision: 9363573a36f148bed13880066b8e7fd3d82bf591 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2010-03-11T22:32:47 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 5 +++++ SoObjects/SOGo/SOGoUserFolder.m | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 0d4019ced..3f6ca52fc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2010-03-11 Wolfgang Sourdeau + * SoObjects/SOGo/SOGoUserFolder.m (_davFetchUsersMatching:): we + were still using the "info" field from the result set for extra + user info, however that field as been renamed "c_info" a couple of + months ago. + * UI/WebServerResources/generic.js (SetLogMessage): we must attach the message to the container even when the message is null. diff --git a/SoObjects/SOGo/SOGoUserFolder.m b/SoObjects/SOGo/SOGoUserFolder.m index 55f153aac..f45e590d6 100644 --- a/SoObjects/SOGo/SOGoUserFolder.m +++ b/SoObjects/SOGo/SOGoUserFolder.m @@ -416,7 +416,7 @@ field = [currentUser objectForKey: @"c_email"]; [fetch appendFormat: @"%@", [field stringByEscapingXMLString]]; - field = [currentUser objectForKey: @"info"]; + field = [currentUser objectForKey: @"c_info"]; if ([field length]) [fetch appendFormat: @"%@", [field stringByEscapingXMLString]];