Author: sdumitriu
Date: 2007-11-20 13:08:30 +0100 (Tue, 20 Nov 2007)
New Revision: 6029
Modified:
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/render/DefaultXWikiRenderingEngine.java
Log:
XWIKI-1869: Caching documents does not consider the current user language,
returning the document in the cached language
Consider both the context language and the document language.
Modified:
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/render/DefaultXWikiRenderingEngine.java
===================================================================
---
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/render/DefaultXWikiRenderingEngine.java
2007-11-20 12:05:29 UTC (rev 6028)
+++
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/render/DefaultXWikiRenderingEngine.java
2007-11-20 12:08:30 UTC (rev 6029)
@@ -340,6 +340,7 @@
+ includingdoc.getFullName() + ":" +
includingdoc.getRealLanguage());
String action = ((context == null) ? "view" : context.getAction());
String lang = ((context == null) ? "" : context.getLanguage());
+ lang += ((contentdoc == null) ? "" : ":" +
contentdoc.getRealLanguage());
return db + "-" + cdoc + "-" + idoc + "-" + qs + "-" + action + "-" +
lang + "-"
+ text.hashCode();
}
_______________________________________________
notifications mailing list
[email protected]
http://lists.xwiki.org/mailman/listinfo/notifications
