Merge branch 'develop'

This commit is contained in:
bnu 2015-05-19 16:33:53 +09:00
commit 1b6fd45e6d

View file

@ -347,7 +347,7 @@ class FrontEndFileHandler extends Handler
} }
elseif(!strncmp($path, '//', 2)) elseif(!strncmp($path, '//', 2))
{ {
return $path; return preg_replace('#^//+#', '//', $path);
} }
$path = preg_replace('@/\./|(?<!:)\/\/@', '/', $path); $path = preg_replace('@/\./|(?<!:)\/\/@', '/', $path);