Merge branch 'develop'

bnu · bnu · commit 1b6fd45e6dfd · 2015-05-19T16:33:53.000+09:00
diff --git a/classes/frontendfile/FrontEndFileHandler.class.php b/classes/frontendfile/FrontEndFileHandler.class.php
@@ -347,7 +347,7 @@ function _normalizeFilePath($path)
 		}
 		elseif(!strncmp($path, '//', 2))
 		{
-			return $path;
+			return preg_replace('#^//+#', '//', $path);
 		}
 
 		$path = preg_replace('@/\./|(?<!:)\/\/@', '/', $path);

Original file line number	Diff line number	Diff line change
`@@ -347,7 +347,7 @@ function _normalizeFilePath($path)`
`347`	`347`	`}`
`348`	`348`	`elseif(!strncmp($path, '//', 2))`
`349`	`349`	`{`
`350`		`- return $path;`
	`350`	`+ return preg_replace('#^//+#', '//', $path);`
`351`	`351`	`}`
`352`	`352`
`353`	`353`	`$path = preg_replace('@/\./\|(?<!:)\/\/@', '/', $path);`