smarty-php/smarty
1
0
Fork 0
mirror of https://github.com/smarty-php/smarty.git synced 2025-08-04 10:24:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

- bugfix allow windows network filepath or wrapper (forum topic 25876) https://github.com/smarty-php/smarty/issues/170

Browse Source
This commit is contained in:
uwetews
2016-01-28 03:51:54 +01:00
parent 41684818d9
commit 193163be29
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
change_log.txt
View File

@@ -1,4 +1,7 @@
 ===== 3.1.30-dev ===== (xx.xx.xx)
28.01.2016
- bugfix allow windows network filepath or wrapper (forum topic 25876) https://github.com/smarty-php/smarty/issues/170
27.01.2016
- revert bugfix compiling {section} did create warning
- bugfix {$smarty.section.customer.loop} did throw compiler error https://github.com/smarty-php/smarty/issues/161

15
libs/Smarty.class.php
View File

@@ -121,7 +121,7 @@ class Smarty extends Smarty_Internal_TemplateBase
/**
* smarty version
*/
const SMARTY_VERSION = '3.1.30-dev/25';
const SMARTY_VERSION = '3.1.30-dev/27';
/**
* define variable scopes
@@ -1144,10 +1144,12 @@ class Smarty extends Smarty_Internal_TemplateBase
if (strpos($path, $nds) !== false) {
$path = str_replace($nds, DS, $path);
}
if (DS != '/' && $path[ 0 ] == DS) {
$path = substr(getcwd(), 0, 2) . $path;
preg_match('%^(?<root>(?:[[:alpha:]]:[\\\\]|/|[\\\\]{2}[[:alpha:]]+|[[:print:]]{2,}:[/]{2}|[\\\\])?)(?<path>(?:[[:print:]]*))$%', $path, $parts);
$path = $parts['path'];
if ($parts['root'] == '\\') {
$parts['root'] = substr(getcwd(), 0, 2) . $parts['root'];
} else {
if ($realpath !== null && $path[ 0 ] != '/' && $path[ 1 ] != ':') {
if ($realpath !== null && !$parts['root']) {
$path = getcwd() . DS . $path;
}
}
@@ -1157,10 +1159,7 @@ class Smarty extends Smarty_Internal_TemplateBase
preg_replace('#([\\\\/][^\\\\/]+[\\\\/]([.]?[\\\\/])*[.][.][\\\\/]([.]?[\\\\/])*)+|([\\\\/]([.]?[\\\\/])+)#',
DS, $path, - 1, $count);
}
if ($realpath === false && ($path[ 0 ] == '/' || $path[ 1 ] == ':')) {
$path = str_ireplace(getcwd(), '.', $path);
}
return $path;
return $parts['root'] . $path;
}
/**