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

[cmailleux]

Author: cmailleux
Date: Tue Nov 27 15:48:41 2007
New Revision: 19299

URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D19299&repname=
=3Djahia
Log:
Correct issue ESI-61 by forcing language code in url

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=3D19299&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 Tue Nov 27 =
15:48:41 2007
@@ -1922,7 +1922,11 @@
                     this, theUser, siteID));
         }
         if (languageCode !=3D null) {
-            theUrl.append(condAppendURL(LANGUAGE_CODE, languageCode));
+            if(settings().isEsiCacheActivated()){
+                theUrl.append(appendParam(LANGUAGE_CODE,languageCode));
+            } else {
+                theUrl.append(condAppendURL(LANGUAGE_CODE, languageCode));
+            }
         }
         if (COMPARE.equals(opModeToUse)) {
             theUrl.append(getEntryStateURLPart(getParameter(ENTRY_STATE_PA=
RAMETER)));
@@ -2437,7 +2441,8 @@
         }        =

         theUrl.append(getPageURLKeyPart(aSite.getHomePageID()));
         theUrl.append(getPageURLPart(aSite.getHomePageID()));
-
+        if(settings().isEsiCacheActivated())
+        theUrl.append(appendParam(LANGUAGE_CODE,getCurrentLocale().toStrin=
g()));
         return encodeURL(theUrl.toString());
     }
 =


_______________________________________________
cvs_list mailing list
cvs_list@jahia.org
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list