Please cherry-pick:

[pizzaservice-war.git] / web / user / login_user_data_saved.xhtml
diff --git a/web/user/login_user_data_saved.xhtml b/web/user/login_user_data_saved.xhtml

index b6e4638597d3417f215036ee196526ad39275a5b..bbe9c2e3d6be9a28310f4fa326b1596bba805ab5 100644 (file)
--- a/web/user/login_user_data_saved.xhtml
+++ b/web/user/login_user_data_saved.xhtml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" ?>
  <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
  <html
         lang="#{localizationController.language}" xml:lang="#{localizationController.language}"
@@ -8,14 +9,16 @@
           >
  
         <ui:composition template="/WEB-INF/templates/login/user/user_base.tpl">
-               <ui:define name="login_title">#{msg.PAGE_TITLE_LOGIN_USER_DATA_SAVED}</ui:define>
+               <ui:define name="login_title">
+                       <h:outputText value="#{msg.PAGE_TITLE_LOGIN_USER_DATA_SAVED}" />
+               </ui:define>
  
                 <ui:define name="content_header">
-                       #{msg.CONTENT_TITLE_LOGIN_USER_DATA_SAVED}
+                       <h:outputText value="#{msg.CONTENT_TITLE_LOGIN_USER_DATA_SAVED}" />
                 </ui:define>
  
                 <ui:define name="content">
-                       <ui:fragment rendered="#{userLoginController.isUserLoggedIn() and not userLoginController.ifUserMustChangePassword()}">
+                       <ui:fragment rendered="#{userLoginController.isUserLoggedIn() and (not userLoginController.ifUserMustChangePassword() or not featureController.isFeatureEnabled('user_must_change_password'))}">
                                 <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
                                         <ui:param name="message" value="#{msg.LOGIN_MESSAGE_DATA_SAVED}" />
                                 </ui:include>