svn commit: [jahia] r17977 - /trunk/core/src/java/org/jahia/params/ProcessingContext.java

[cmailleux]

Author: cmailleux
Date: Thu Jul 12 18:17:54 2007
New Revision: 17977

URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D17977&repname=
=3Djahia
Log:
Port of commit [17319] Resolve issue ESI-317

Modified:
    trunk/core/src/java/org/jahia/params/ProcessingContext.java

Modified: trunk/core/src/java/org/jahia/params/ProcessingContext.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/params/ProcessingContext.java&rev=3D17977&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/ProcessingContext.java (original)
+++ trunk/core/src/java/org/jahia/params/ProcessingContext.java Thu Jul 12 =
18:17:54 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
cvs_list@jahia.org
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list