FC-3064 revert to old logic for skipping ancestor webskin processing

farcrycore · Feb 18, 2016 · d6f16a2 · d6f16a2
1 parent 101cf8e
commit d6f16a2
Showing 1 changed file with 1 addition and 3 deletions.
diff --git a/packages/fourq/fourq.cfc b/packages/fourq/fourq.cfc
@@ -459,10 +459,8 @@ So in the case of a database called 'fourq' - the correct application.dbowner va
 			<cfset webskinHTML = application.fc.lib.postprocess.apply(webskinHTML,application.stCOAPI[arguments.webskinTypename].stWebskins[arguments.webskinTemplate].postprocess) />
 		</cfif>
 
+		<cfif structKeyExists(request,"mode") AND (request.mode.showdraft EQ 1 OR request.mode.tracewebskins eq 1 OR request.mode.design eq 1 OR request.mode.lvalidstatus NEQ "approved" OR (structKeyExists(url, "updateapp") AND url.updateapp EQ 1))>
 			<!--- DON'T CACHE IN SITUATIONS WHERE THE CONTENT IS NOT FOR PUBLIC CONSUMPTION --->
-		<cfif (isdefined("application.fc.lib.objectbroker.isCacheable") AND not application.fc.lib.objectbroker.isCacheable(arguments.stobj.typename,arguments.webskinTemplate,"write")) 
-			OR (not isdefined("application.fc.lib.objectbroker.isCacheable") AND structKeyExists(request,"mode") AND (request.mode.showdraft EQ 1 OR request.mode.tracewebskins eq 1 OR request.mode.design eq 1 OR request.mode.lvalidstatus NEQ "approved" OR (structKeyExists(url, "updateapp") AND url.updateapp EQ 1)))>
-
 		<cfelse>
 			<cfif arrayLen(request.aAncestorWebskins)>