Merge branch 'pr/1290' into develop

This commit is contained in:
bnu 2015-03-23 15:16:25 +09:00
commit 79f7d85e66
2 changed files with 5 additions and 1 deletions

View file

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

View file

@ -653,7 +653,7 @@ class TemplateHandler
$metafile = '';
$pathinfo = pathinfo($attr['target']);
$doUnload = ($m[3] === 'unload');
$isRemote = !!preg_match('@^https?://@i', $attr['target']);
$isRemote = !!preg_match('@^(https?:)?//@i', $attr['target']);
if(!$isRemote)
{