TPS
/
ORIENT
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Adds support for Windows-based paths

This commit is contained in:
Sam Georges 2014-09-29 12:59:14 +10:00
parent aec05adc05
commit 2255b9404e
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/system/traits/ConfigMaker.php
View File

@ -122,7 +122,7 @@ trait ConfigMaker
$fileName = File::symbolizePath($fileName, $fileName);
if (substr($fileName, 0, 1) == '/' || realpath($fileName) !== false)
if (File::isLocalPath($fileName) || realpath($fileName) !== false)
return $fileName;
if (!is_array($configPath))

4
modules/system/traits/ViewMaker.php
View File

@ -129,7 +129,7 @@ trait ViewMaker
*/
public function makeLayoutPartial($partial, $params = [])
{
if (!in_array(substr($partial, 0, 1), ['/', '@']))
if (!File::isLocalPath($partial) && !File::isPathSymbol($partial))
$partial = '_' . strtolower($partial);
return $this->makeLayout($partial, $params);
@ -153,7 +153,7 @@ trait ViewMaker
$fileName = File::symbolizePath($fileName, $fileName);
if (substr($fileName, 0, 1) == '/' || realpath($fileName) !== false)
if (File::isLocalPath($fileName) || realpath($fileName) !== false)
return $fileName;
if (!is_array($viewPath))