From 3d401debb04e9823971b9254476b50ded59a0298 Mon Sep 17 00:00:00 2001
From: Massimiliano Assante <massimiliano.assante@isti.cnr.it>
Date: Thu, 12 Oct 2017 09:48:09 +0000
Subject: [PATCH] Bug #9923 fix,the portal no longer show the user password
 after a user completes the registration

git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/portal/liferay62-plugins/login-hook@155173 82a268e6-3cf1-43bd-a215-b396298e98cf
---
 pom.xml                                                       | 2 +-
 src/main/resources/portal.properties                          | 2 +-
 .../webapp/META-INF/custom_jsps/html/portlet/login/login.jsp  | 4 +---
 src/main/webapp/WEB-INF/liferay-plugin-package.properties     | 2 +-
 4 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/pom.xml b/pom.xml
index 6e46afb..c9e3f70 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
 	<artifactId>login-hook</artifactId>
 	<packaging>war</packaging>
 	<name>login-hook Hook</name>
-	<version>1.3.0-SNAPSHOT</version>
+	<version>1.3.1-SNAPSHOT</version>
 
 	<scm>
 		<connection>scm:svn:https://svn.d4science.research-infrastructures.eu/gcube/branches/portal/login-hook/1.2</connection>
diff --git a/src/main/resources/portal.properties b/src/main/resources/portal.properties
index c9d2e50..49f963e 100644
--- a/src/main/resources/portal.properties
+++ b/src/main/resources/portal.properties
@@ -10,4 +10,4 @@
 ##																														 ##
 ###########################################################################################################################
 
-login.form.navigation.socials=google, linkedIn, windowsLive
\ No newline at end of file
+login.form.navigation.socials=google, linkedIn
\ No newline at end of file
diff --git a/src/main/webapp/META-INF/custom_jsps/html/portlet/login/login.jsp b/src/main/webapp/META-INF/custom_jsps/html/portlet/login/login.jsp
index 16ba6aa..77dcf9b 100644
--- a/src/main/webapp/META-INF/custom_jsps/html/portlet/login/login.jsp
+++ b/src/main/webapp/META-INF/custom_jsps/html/portlet/login/login.jsp
@@ -140,9 +140,7 @@
 								</c:if>
 							</c:when>
 							<c:otherwise>
-								<%=LanguageUtil.format(pageContext,
-												"thank-you-for-creating-an-account.-your-password-is-x", userPassword,
-												false)%>
+								<%=LanguageUtil.get(pageContext, "thank-you-for-creating-an-account")%> Please login now.
 							</c:otherwise>
 						</c:choose>
 
diff --git a/src/main/webapp/WEB-INF/liferay-plugin-package.properties b/src/main/webapp/WEB-INF/liferay-plugin-package.properties
index 537f60f..b462c70 100644
--- a/src/main/webapp/WEB-INF/liferay-plugin-package.properties
+++ b/src/main/webapp/WEB-INF/liferay-plugin-package.properties
@@ -1,6 +1,6 @@
 name=login-hook
 module-group-id=liferay
-module-incremental-version=2
+module-incremental-version=3
 tags=
 short-description=
 change-log=