mcardle 2005/11/24 15:36:02 CET
Modified files:
core/src/java/org/jahia/params ParamBean.java
ProcessingContext.java
Log:
* restored /cache/ parameter in ESI mode
Revision Changes Path
1.44 +0 -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.43&r2=1.44&f=h
1.18 +0 -4
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.17&r2=1.18&f=h
Index: ParamBean.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/params/ParamBean.java,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- ParamBean.java 10 Nov 2005 11:14:30 -0000 1.43
+++ ParamBean.java 24 Nov 2005 14:36:01 -0000 1.44
@@ -2608,11 +2608,7 @@
//-------------------------------------------------------------------------
// SH 12 Oct. 2001 : Original implementation
protected final String getCacheModeURLPart(final String mode) {
- //Ignore cache mode URL parameter when ESI is active
- if (!settings().lookupBoolean(SettingsBean.ESI_CACHE_ACTIVATED)) {
return condAppendURL(CACHE_MODE_PARAMETER, mode);
- } else
- return "";
}
//--------------------------------------------------------------------------
Index: ProcessingContext.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/params/ProcessingContext.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- ProcessingContext.java 14 Nov 2005 16:06:12 -0000 1.17
+++ ProcessingContext.java 24 Nov 2005 14:36:02 -0000 1.18
@@ -2509,11 +2509,7 @@
//-------------------------------------------------------------------------
// SH 12 Oct. 2001 : Original implementation
protected String getCacheModeURLPart(final String mode) {
- //Ignore cache mode URL parameter when ESI is active
- if (!settings().lookupBoolean(SettingsBean.ESI_CACHE_ACTIVATED)) {
return condAppendURL(CACHE_MODE_PARAMETER, mode);
- } else
- return "";
}
//--------------------------------------------------------------------------
