From d27f86842ca0e1d02358f0d11ffe7a6f850d61da Mon Sep 17 00:00:00 2001
From: sidwing <sidney.wing@liquidityservices.com>
Date: Tue, 22 Jan 2019 09:53:08 -0600
Subject: [PATCH 1/2] Much like Railo/Lucee - CF2018 has its own
 getCanonicalPath function.  FB5 "also" has a function with this name - in its
 core.  I have renamed the FB function to "getFBCanonicalPath"

---
 corefiles/PathUtil.cfc           | 8 ++++----
 corefiles/fuseboxApplication.cfc | 4 ++--
 corefiles/fuseboxCircuit.cfc     | 2 +-
 corefiles/fuseboxPlugin.cfc      | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/corefiles/PathUtil.cfc b/corefiles/PathUtil.cfc
index 049ec63..2635426 100644
--- a/corefiles/PathUtil.cfc
+++ b/corefiles/PathUtil.cfc
@@ -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 = getFBCanonicalPath(normalizePartialPath(arguments.callerPath) & normalizePartialPath(arguments.appPath)) />
 		<cfset calculatePaths(variables.approotdirectory) />
 		<cfreturn this />
 	</cffunction>
@@ -60,7 +60,7 @@
 		
 	</cffunction>
 	
-	<cffunction name="getCanonicalPath" returntype="string" access="public" output="false" 
+	<cffunction name="getFBCanonicalPath" returntype="string" access="public" output="false" 
 				hint="I return a canonical file path (with all /../ sections resolved).">
 		<cfargument name="path" type="string" required="true" 
 					hint="I am the path to resolve." />
@@ -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 = getFBCanonicalPath(filename) />
+			<cfset var webRoot = getFBCanonicalPath(expandPath("/")) />
 			<cfset var lenWebRoot = len(webRoot) />
 			<cfset var lenAppRoot = len(getApplicationRoot()) />
 			<cfset var lenCfcPath = len(cfcPath) />
diff --git a/corefiles/fuseboxApplication.cfc b/corefiles/fuseboxApplication.cfc
index 1cd5135..91d6c21 100644
--- a/corefiles/fuseboxApplication.cfc
+++ b/corefiles/fuseboxApplication.cfc
@@ -1291,12 +1291,12 @@ limitations under the License.
 		
 	</cffunction>
 	
-	<cffunction name="getCanonicalPath" returntype="string" access="public" output="false" 
+	<cffunction name="getFBCanonicalPath" returntype="string" access="public" output="false" 
 				hint="I return a canonical file path (with all /../ sections resolved).">
 		<cfargument name="path" type="string" required="true" 
 					hint="I am the path to resolve." />
 					
-		<cfreturn pathUtil.getCanonicalPath(arguments.path) />
+		<cfreturn pathUtil.getFBCanonicalPath(arguments.path) />
 		
 	</cffunction>
 	
diff --git a/corefiles/fuseboxCircuit.cfc b/corefiles/fuseboxCircuit.cfc
index a8113fb..b54a5a5 100644
--- a/corefiles/fuseboxCircuit.cfc
+++ b/corefiles/fuseboxCircuit.cfc
@@ -70,7 +70,7 @@ limitations under the License.
 			</cfif>
 		</cfif>
 		
-		<cfset variables.fullPath = variables.fuseboxApplication.getCanonicalPath(variables.fullPath) />
+		<cfset variables.fullPath = variables.fuseboxApplication.getFBCanonicalPath(variables.fullPath) />
 
 		<!---
 			this was not correctly normalized prior to ticket 139 but it didn't really matter
diff --git a/corefiles/fuseboxPlugin.cfc b/corefiles/fuseboxPlugin.cfc
index 9642b33..b292a30 100644
--- a/corefiles/fuseboxPlugin.cfc
+++ b/corefiles/fuseboxPlugin.cfc
@@ -110,7 +110,7 @@ limitations under the License.
 														this.path,arguments.fbApp.getApplicationRoot()) />
 			</cfif>
 			
-			<cfset this.rootpath = arguments.fbApp.getCanonicalPath(this.rootpath) />
+			<cfset this.rootpath = arguments.fbApp.getFBCanonicalPath(this.rootpath) />
 			
 			<cfset variables.parameters = arguments.pluginXML.xmlChildren />
 			<cfset variables.paramVerbs = structNew() />

From 27b6e3b42ae4efdb122ffaf3786dc3be852ea879 Mon Sep 17 00:00:00 2001
From: apendrag0n3 <sid.wing@gmail.com>
Date: Wed, 23 Jan 2019 07:31:28 -0600
Subject: [PATCH 2/2] Set theme jekyll-theme-time-machine

---
 _config.yml | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 _config.yml

diff --git a/_config.yml b/_config.yml
new file mode 100644
index 0000000..ddeb671
--- /dev/null
+++ b/_config.yml
@@ -0,0 +1 @@
+theme: jekyll-theme-time-machine
\ No newline at end of file