From b596814861c7880cc41e18a44adb1309d728aded Mon Sep 17 00:00:00 2001 From: Derek Hulley Date: Tue, 19 Dec 2006 14:36:46 +0000 Subject: [PATCH] Merge 1.4 to HEAD svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4351 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4352 . svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4353 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4354 . svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4354 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4362 . git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4657 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- source/java/org/alfresco/web/bean/workflow/WorkflowBean.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/source/java/org/alfresco/web/bean/workflow/WorkflowBean.java b/source/java/org/alfresco/web/bean/workflow/WorkflowBean.java index fc079cd88a..ec73ed45de 100644 --- a/source/java/org/alfresco/web/bean/workflow/WorkflowBean.java +++ b/source/java/org/alfresco/web/bean/workflow/WorkflowBean.java @@ -17,7 +17,6 @@ import org.alfresco.service.cmr.workflow.WorkflowTaskDefinition; import org.alfresco.service.cmr.workflow.WorkflowTaskState; import org.alfresco.service.cmr.workflow.WorkflowTransition; import org.alfresco.service.namespace.QName; -import org.alfresco.util.ISO9075; import org.alfresco.web.app.Application; import org.alfresco.web.bean.NavigationBean; import org.alfresco.web.bean.repository.Node; @@ -61,7 +60,7 @@ public class WorkflowBean // get the current username FacesContext context = FacesContext.getCurrentInstance(); User user = Application.getCurrentUser(context); - String userName = ISO9075.encode(user.getUserName()); + String userName = user.getUserName(); UserTransaction tx = null; try @@ -111,7 +110,7 @@ public class WorkflowBean // get the current username FacesContext context = FacesContext.getCurrentInstance(); User user = Application.getCurrentUser(context); - String userName = ISO9075.encode(user.getUserName()); + String userName = user.getUserName(); UserTransaction tx = null; try