mcardle 2005/12/23 01:05:44 CET
Modified files:
core/src/java/org/jahia/params ParamBean.java
ProcessingContext.java
Log:
* reordered order of admin menu exit url
Revision Changes Path
1.48 +5 -4 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.47&r2=1.48&f=h
1.22 +6 -5
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.21&r2=1.22&f=h
Index: ProcessingContext.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/params/ProcessingContext.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- ProcessingContext.java 22 Dec 2005 23:04:40 -0000 1.21
+++ ProcessingContext.java 23 Dec 2005 00:05:43 -0000 1.22
@@ -656,7 +656,7 @@
* in the request URL by specifying the following : /cache/on,
* /cache/onlyupdate, /cache/offonce, /cache/bypass, /cache/off. If it
* isn't specified in the URL the default mode is /cache/on. It may also
be
- * changed during a request by the setCacheStatus call in order to
control
+ * changed during a request by the set call in order to control
* the ProcessingContext's URL generation code. In order to retrieve the
original
* request cache status mode, see the getOriginalCacheStatus method.
*
@@ -2710,10 +2710,6 @@
newSiteURL.append("/site/");
newSiteURL.append(theSite.getSiteKey());
}
- if (pageID != -1) {
- newSiteURL.append("/pid/");
- newSiteURL.append(pageID);
- }
if (withOperationMode) {
final SessionState session = this.getSessionState();
@@ -2732,6 +2728,11 @@
}
}
+ if (pageID != -1) {
+ newSiteURL.append("/pid/");
+ newSiteURL.append(pageID);
+ }
+
if (withSessionID) {
String serverURL = encodeURL(newSiteURL.toString());
if (sessionIDStr != null) {
Index: ParamBean.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/params/ParamBean.java,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- ParamBean.java 22 Dec 2005 23:04:40 -0000 1.47
+++ ParamBean.java 23 Dec 2005 00:05:43 -0000 1.48
@@ -2844,10 +2844,6 @@
newSiteURL.append("/site/");
newSiteURL.append(theSite.getSiteKey());
}
- if (pageID != -1) {
- newSiteURL.append("/pid/");
- newSiteURL.append(pageID);
- }
if (withOperationMode) {
try {
@@ -2868,6 +2864,11 @@
}
}
+ if (pageID != -1) {
+ newSiteURL.append("/pid/");
+ newSiteURL.append(pageID);
+ }
+
if (withSessionID) {
String serverURL = encodeURL(newSiteURL.toString());
if (sessionIDStr != null) {
