mcardle 2005/12/28 19:14:51 CET
Modified files:
core/src/java/org/jahia/params ParamBean.java
ProcessingContext.java
Log:
* fix http://www.jahia.org/jira/browse/JAHIA-610 to force usage of UrlKey
during admin menu exit
Revision Changes Path
1.49 +2 -2 jahia/core/src/java/org/jahia/params/ParamBean.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/params/ParamBean.java.diff?r1=1.48&r2=1.49&f=h
1.23 +2 -2
jahia/core/src/java/org/jahia/params/ProcessingContext.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/params/ProcessingContext.java.diff?r1=1.22&r2=1.23&f=h
Index: ProcessingContext.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/params/ProcessingContext.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- ProcessingContext.java 23 Dec 2005 00:05:43 -0000 1.22
+++ ProcessingContext.java 28 Dec 2005 18:14:50 -0000 1.23
@@ -2729,8 +2729,8 @@
}
if (pageID != -1) {
- newSiteURL.append("/pid/");
- newSiteURL.append(pageID);
+ newSiteURL.append(getPageURLKeyPart(pageID));
+ newSiteURL.append(getPageURLPart(pageID));
}
if (withSessionID) {
Index: ParamBean.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/params/ParamBean.java,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- ParamBean.java 23 Dec 2005 00:05:43 -0000 1.48
+++ ParamBean.java 28 Dec 2005 18:14:50 -0000 1.49
@@ -2865,8 +2865,8 @@
}
if (pageID != -1) {
- newSiteURL.append("/pid/");
- newSiteURL.append(pageID);
+ newSiteURL.append(getPageURLKeyPart(pageID));
+ newSiteURL.append(getPageURLPart(pageID));
}
if (withSessionID) {
