Author: bpapez
Date: Wed Jun 6 17:49:04 2007
New Revision: 17496
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D17496&repname=
=3Djahia
Log:
[no jira] slight refactoring of getting homepage-id
Modified:
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/login/Logi=
n_Engine.java
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/logi=
n/Login_Engine.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/engines/login/Login_Engine.java&rev=3D17496=
&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/login/Logi=
n_Engine.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/login/Logi=
n_Engine.java Wed Jun 6 17:49:04 2007
@@ -184,19 +184,14 @@
if (loginPage =3D=3D null) {
loginPage =3D getHomepage (jParams.getSite (), theUser, jP=
arams);
}
- if (loginPage =3D=3D null) {
- loginPage =3D jParams.getSite().getHomePage(jParams.getEnt=
ryLoadRequest());
- }
-
- final int pid;
- if (loginPage =3D=3D null) {
- pid =3D jParams.getSite().getHomePageID();
- } else {
- pid =3D loginPage.getID();
+ int loginPageId =3D loginPage =3D=3D null ? 0 : loginPage.getI=
D(); =
+ if (loginPageId =3D=3D 0) {
+ loginPageId =3D jParams.getSite ().getHomePageID();
}
=
- engineMap.put(ENGINE_URL_PARAM, jParams.composePageUrl(pid));
- logger.debug ("engineUrl=3D" + jParams.composePageUrl (pid));
+ String engineUrl =3D jParams.composePageUrl (loginPageId, jPar=
ams.getLocale().toString());
+ engineMap.put(ENGINE_URL_PARAM, engineUrl);
+ logger.debug ("engineUrl=3D" + engineUrl);
=
JahiaEvent theEvent =3D new JahiaEvent (this, jParams, theUser=
);
ServicesRegistry.getInstance ().getJahiaEventService ().fireLo=
gin (theEvent);
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
