Author: tdraier
Date: Fri Sep 21 10:41:42 2007
New Revision: 18593
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18593&repname=
=3Djahia
Log:
redirect to home page if requested page not found (as before ) ( port 18410=
)
Modified:
trunk/core/src/java/org/jahia/params/ParamBean.java
Modified: trunk/core/src/java/org/jahia/params/ParamBean.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/params/ParamBean.java&rev=3D18593&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
--- trunk/core/src/java/org/jahia/params/ParamBean.java (original)
+++ trunk/core/src/java/org/jahia/params/ParamBean.java Fri Sep 21 10:41:42=
2007
@@ -375,12 +375,16 @@
=
setSiteInfoFromSiteFound();
=
- if (isContentPageLoadedWhileTryingToFindSiteByPageID() =3D=3D =
false){
- if( isPageRequestedByID() ){
- setContentPageToPageWithID();
- } else if ( isPageRequestedByKey() ){
- setContentPageToPageWithURLKey();
- } else {
+ if (isContentPageLoadedWhileTryingToFindSiteByPageID() =3D=3D =
false) {
+ try {
+ if (isPageRequestedByID()) {
+ setContentPageToPageWithID();
+ } else if (isPageRequestedByKey()) {
+ setContentPageToPageWithURLKey();
+ } else {
+ setContentPage(getSite().getHomeContentPage());
+ }
+ } catch (JahiaPageNotFoundException e) {
setContentPage(getSite().getHomeContentPage());
}
} =
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
