Author: shuber
Date: Wed Sep 12 12:10:06 2007
New Revision: 18429
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18429&repname=
=3Djahia
Log:
Make sure that cross-references are only used if we use the full-page HTML =
cache.
Modified:
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/core/Core_=
Engine.java
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/core=
/Core_Engine.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/engines/core/Core_Engine.java&rev=3D18429&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/engines/core/Core_=
Engine.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/core/Core_=
Engine.java Wed Sep 12 12:10:06 2007
@@ -33,6 +33,7 @@
import org.jahia.params.ProcessingContext;
import org.jahia.registries.ServicesRegistry;
import org.jahia.services.pages.JahiaPageDefinition;
+import org.jahia.settings.SettingsBean;
=
import java.io.File;
import java.util.*;
@@ -246,8 +247,8 @@
*/
private void postProcessCore (JahiaData jData)
throws JahiaException {
- if(!jData.getProcessingContext().settings().isEsiCacheActivated() =
&&
- !jData.getProcessingContext().settings().isOutputCacheExpiratio=
nOnly()) {
+ if (jData.getProcessingContext().settings().lookupBoolean(Settings=
Bean.OUTPUT_CACHE_ACTIVATED) &&
+ !jData.getProcessingContext().settings().isOutputCacheExpirati=
onOnly()) {
handleAbsoluteReferencesChanges (jData);
}
}
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
