Please cherry-pick:

- fixed tzpo ...

Signed-off-by: Roland Häder <roland@mxchange.org>

diff --git a/web/WEB-INF/web.xml b/web/WEB-INF/web.xml
index a8025bfca5dc8210d40cee40d19c1efaf1645217..540540ef25f04778beee6d59791469a97e7147dd 100644 (file)
--- a/web/WEB-INF/web.xml
+++ b/web/WEB-INF/web.xml
@@ -129,7 +129,7 @@
     </context-param>
     <context-param>
         <description>Whether user registration page is in index or own page.</description>
-        <param-name>is_feature_user_registraion_in_index_enabled</param-name>
+        <param-name>is_feature_user_registration_in_index_enabled</param-name>
         <param-value>false</param-value>
     </context-param>
     <servlet>

diff --git a/web/guest/user/user_register.xhtml b/web/guest/user/user_register.xhtml
index 1bd6dd9ba972aab61ca717b1c366894a1f79c00f..f15aed72dc5bbc22f4d1cfcc9e901d17b86fee23 100644 (file)
--- a/web/guest/user/user_register.xhtml
+++ b/web/guest/user/user_register.xhtml
@@ -16,7 +16,7 @@
                        <h:outputText value="#{msg.CONTENT_TITLE_USER_REGISTER}" />
                </ui:define>
 
-               <ui:define name="content" rendered="#{not featureController.isFeatureEnabled('user_registraion_in_index')}">
+               <ui:define name="content" rendered="#{not featureController.isFeatureEnabled('user_registration_in_index')}">
                        <ui:fragment rendered="#{featureController.isFeatureEnabled('user_registration')}">
                                <ui:fragment rendered="#{featureController.isFeatureEnabled('user_name_required')}">
                                        <div class="para">
@@ -47,7 +47,7 @@
                        </ui:fragment>
                </ui:define>
 
-               <ui:define name="content" rendered="#{featureController.isFeatureEnabled('user_registraion_in_index')}">
+               <ui:define name="content" rendered="#{featureController.isFeatureEnabled('user_registration_in_index')}">
                                <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
                                        <ui:param name="message" value="#{msg.ERROR_GUEST_REGISTRATION_IN_INDEX_ENABLED}" />
                                        <ui:param name="styleClass" value="errors" />

diff --git a/web/index.xhtml b/web/index.xhtml
index 2d926740a69c467a7c918adb0385bbcdd832d9a2..0aa8ec5145e8d6cdb7e0f6a9cd83e7677f6d23c7 100644 (file)
--- a/web/index.xhtml
+++ b/web/index.xhtml
@@ -16,7 +16,7 @@
                        <h:outputText value="#{msg.CONTENT_TITLE_INDEX_WELCOME}" />
                </ui:define>
 
-               <ui:define name="content" rendered="#{featureController.isFeatureEnabled('user_registraion_in_index')}">
+               <ui:define name="content" rendered="#{featureController.isFeatureEnabled('user_registration_in_index')}">
                        <div class="registration_form">
                                <ui:fragment rendered="#{featureController.isFeatureEnabled('user_register_multiple_page')}">
                                        <ui:include src="/WEB-INF/templates/guest/user/register/guest_form_register_page1.tpl" />
@@ -27,7 +27,7 @@
                        </div>
                </ui:define>
 
-               <ui:define name="content" rendered="#{not featureController.isFeatureEnabled('user_registraion_in_index')}">
+               <ui:define name="content" rendered="#{not featureController.isFeatureEnabled('user_registration_in_index')}">
                        <ui:include src="/WEB-INF/templates/guest/guest_index.tpl" />
                </ui:define>
        </ui:composition>