From 8ef73a1439a7896fd880ea5e9461c6d38fe3a403 Mon Sep 17 00:00:00 2001 From: Derek Hulley Date: Fri, 23 May 2008 21:41:53 +0000 Subject: [PATCH] Merged V2.9 to HEAD 9241: Merged V2.2 to V2.9 9119: Merged V2.1 to V2.2 8671: Fix for AR-2221 - JavaScript scriptable Map objects recursively converted to Freemarker accessable maps 9256: Merged V2.2 to V2.9 9100: Merged V2.1 to V2.2 8728 : Latest AMP changes for AR-2212 8731: Faster content store cleaner 8738: Fix for AWC 1930 - support simple bind when building DNs that contain a comma 8835: Fix regression issue as discussed in ACT 2019 8861: Fix WCM-1158 8866: Fixed AR-2272: Module Management Tool distribution is broken 8872: Fixed distribution of benchmark executable jar after EHCache upgrade 8933: Fix for ACT-2469 git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@9260 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../org/alfresco/web/app/servlet/AuthenticationHelper.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/source/java/org/alfresco/web/app/servlet/AuthenticationHelper.java b/source/java/org/alfresco/web/app/servlet/AuthenticationHelper.java index 18283d22aa..8a0dba0797 100644 --- a/source/java/org/alfresco/web/app/servlet/AuthenticationHelper.java +++ b/source/java/org/alfresco/web/app/servlet/AuthenticationHelper.java @@ -240,12 +240,12 @@ public final class AuthenticationHelper setUsernameCookie(req, res, loginBean.getUsernameInternal()); } - // Set the current locale - I18NUtil.setLocale(Application.getLanguage(req.getSession())); - // setup faces context FacesHelper.getFacesContext(req, res, sc); + // Set the current locale + I18NUtil.setLocale(Application.getLanguage(req.getSession())); + if (loginBean != null && (loginBean.getUserPreferencesBean() != null)) { String contentFilterLanguageStr = loginBean.getUserPreferencesBean().getContentFilterLanguage();