Author: cmailleux
Date: Wed May 16 11:24:28 2007
New Revision: 17319
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D17319&repname=
=3Djahia
Log:
Issue ESI-317
Doesn't add the query string for language url if esi is activated to avoid =
presence of "__esi_fragment" in the url
Modified:
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/params/ParamBean.j=
ava
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/params/ProcessingC=
ontext.java
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/params/Param=
Bean.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/params/ParamBean.java&rev=3D17319&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/params/ParamBean.j=
ava (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/params/ParamBean.j=
ava Wed May 16 11:24:28 2007
@@ -2244,7 +2244,7 @@
theUrl.append(getPageURLPart(contentPage.getID()));
}
String queryString =3D this.getQueryString();
- if ( queryString !=3D null && !"".equals(queryString) ){
+ if ( queryString !=3D null && !"".equals(queryString) && !Jahia.ge=
tSettings().isEsiCacheActivated() && !queryString.contains("__esi_fragment"=
)){
theUrl.append("?").append(queryString);
}
return encodeURL(theUrl.toString());
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/params/Proce=
ssingContext.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/params/ProcessingContext.java&rev=3D17319&r=
epname=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/params/ProcessingC=
ontext.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/params/ProcessingC=
ontext.java Wed May 16 11:24:28 2007
@@ -2342,7 +2342,7 @@
theUrl.append(getPageURLPart(getContentPage().getID()));
}
String queryString =3D this.getQueryString();
- if ( queryString !=3D null && !"".equals(queryString) ){
+ if ( queryString !=3D null && !"".equals(queryString) && !Jahia.ge=
tSettings().isEsiCacheActivated() && !queryString.contains("__esi_fragment"=
)){
theUrl.append("?").append(queryString);
}
return encodeURL(theUrl.toString());
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
