Skip to content

Commit 07054fb

Browse files
committed
avoid conflict with LBPS resources
1 parent ab72131 commit 07054fb

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

core/api.cfc

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1063,15 +1063,15 @@
10631063

10641064
<cffunction name="guessResourcesPath" access="private" output="false" returntype="string" hint="used to try and figure out the absolute path of the /resources folder even though this file may not be in the web root">
10651065
<!--- if /resources has been explicitly defined in an server/application mapping, it should take precedence --->
1066-
<cfif directoryExists(expandPath("resources"))>
1067-
<cfreturn "resources" />
1068-
<cfelseif directoryExists(expandPath("/resources"))>
1069-
<cfreturn "/resources" />
1066+
<cfif directoryExists(expandPath("taffy_resources"))>
1067+
<cfreturn "taffy_resources" />
1068+
<cfelseif directoryExists(expandPath("/taffy_resources"))>
1069+
<cfreturn "/taffy_resources" />
10701070
</cfif>
10711071

10721072
<!--- if all else fails, fall through to guessing where /resources lives --->
10731073
<cfset local.indexcfmpath = cgi.script_name />
1074-
<cfset local.resourcesPath = listDeleteAt(local.indexcfmpath, listLen(local.indexcfmpath, "/"), "/") & "/resources" />
1074+
<cfset local.resourcesPath = listDeleteAt(local.indexcfmpath, listLen(local.indexcfmpath, "/"), "/") & "/taffy_resources" />
10751075

10761076
<cfif GetContextRoot() NEQ "">
10771077
<cfset local.resourcesPath = ReReplace(local.resourcesPath,"^#GetContextRoot()#","")>

0 commit comments

Comments
 (0)