Skip to content

Resolve name conflict with Railo/Lucee BIF getCanonicalPath #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
isapir wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Resolve name conflict with Railo/Lucee BIF getCanonicalPath #12

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions corefiles/PathUtil.cfc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<cfargument name="callerPath" type="string" required="true"
hint="I am FUSEBOX_CALLER_PATH." />

<cfset variables.approotdirectory = getCanonicalPath(normalizePartialPath(arguments.callerPath) & normalizePartialPath(arguments.appPath)) />
<cfset variables.approotdirectory = this.getCanonicalPath(normalizePartialPath(arguments.callerPath) & normalizePartialPath(arguments.appPath)) />
<cfset calculatePaths(variables.approotdirectory) />
<cfreturn this />
</cffunction>
Expand Down Expand Up @@ -134,8 +134,8 @@
hint="I deduce the dot-separated path to a CFC given its file system path (and a few heuristics).">
<cfargument name="filename" type="string" required="true" />

<cfset var cfcPath = getCanonicalPath(filename) />
<cfset var webRoot = getCanonicalPath(expandPath("/")) />
<cfset var cfcPath = this.getCanonicalPath(filename) />
<cfset var webRoot = this.getCanonicalPath(expandPath("/")) />
<cfset var lenWebRoot = len(webRoot) />
<cfset var lenAppRoot = len(getApplicationRoot()) />
<cfset var lenCfcPath = len(cfcPath) />
Expand Down