You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by vd...@apache.org on 2013/08/15 13:18:26 UTC
svn commit: r1514236 -
/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/UserManager.java
Author: vdegtyarev
Date: Thu Aug 15 11:18:26 2013
New Revision: 1514236
URL: http://svn.apache.org/r1514236
Log:
Use java timezone instead of om timezone in the registerUserInit method
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/UserManager.java
Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/UserManager.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/UserManager.java?rev=1514236&r1=1514235&r2=1514236&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/UserManager.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/UserManager.java Thu Aug 15 11:18:26 2013
@@ -666,7 +666,7 @@ public class UserManager {
String additionalname, String fax, String zip, long states_id,
String town, long language_id, boolean sendWelcomeMessage,
List<Long> organisations, String phone, boolean sendSMS, String baseURL,
- Boolean sendConfirmation, String jname_timezone, Boolean forceTimeZoneCheck,
+ Boolean sendConfirmation, String iCalTz, Boolean forceTimeZoneCheck,
String userOffers, String userSearchs, Boolean showContactData,
Boolean showContactDataToContacts) throws Exception {
return registerUserInit(user_level, level_id, availible,
@@ -676,7 +676,7 @@ public class UserManager {
town, language_id, sendWelcomeMessage,
organisations, phone, sendSMS, baseURL,
sendConfirmation,
- timezoneUtil.getTimezoneByInternalJName(jname_timezone),
+ timezoneUtil.getTimeZone(iCalTz),
forceTimeZoneCheck,
userOffers, userSearchs, showContactData,
showContactDataToContacts, null);