attempt at escaping url from paths correctly

docpad · Jun 25, 2013 · 83a50b9 · 83a50b9
1 parent eb0b79a
commit 83a50b9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/lib/models/document.coffee b/src/lib/models/document.coffee
@@ -295,12 +295,13 @@ class DocumentModel extends FileModel
 				# Figure out the rendered url
 				if outFilename
 					if relativeDirPath
-						relativeOutPath = "#{relativeDirPath}/#{outFilename}"
+						relativeOutPath = pathUtil.join(relativeDirPath, outFilename)
 					else
 						relativeOutPath = "#{outFilename}"
 					changes.relativeOutPath = relativeOutPath
 					unless url
-						changes.url = url = "/#{relativeOutPath}"
+						escapedRelativeOutPath = relativeOutPath.replace(/[\\]/g, '/')
+						changes.url = url = "/#{escapedRelativeOutPath}"
 
 				# Set name if it doesn't exist already
 				if !name and outFilename?

diff --git a/src/lib/models/file.coffee b/src/lib/models/file.coffee
@@ -597,7 +597,8 @@ class FileModel extends Model
 
 		# Create the URL for the file
 		if !url and relativePath
-			url = "/#{relativePath}"
+			escapedRelativePath = relativePath.replace(/[\\]/g, '/')
+			url = "/#{escapedRelativePath}"
 			@setUrl(url)
 
 		# Create a slug for the file