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

- bugfix templates filepath with multibyte characters did not work

Browse Source 
https://github.com/smarty-php/smarty/issues/385
This commit is contained in:
Uwe Tews
2017-08-26 14:56:02 +02:00
parent f90b449d21
commit 94c2ab7e54
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
change_log.txt
View File

@@ -2,6 +2,8 @@
26.8.2017 26.8.2017
- bugfix chained modifier failed when last modifier parameter is a signed value - bugfix chained modifier failed when last modifier parameter is a signed value
https://github.com/smarty-php/smarty/issues/327 https://github.com/smarty-php/smarty/issues/327
- bugfix templates filepath with multibyte characters did not work
https://github.com/smarty-php/smarty/issues/385
09.8.2017 09.8.2017
- improvement repeated delimiter like {{ and }} will be treated as literal - improvement repeated delimiter like {{ and }} will be treated as literal

10
libs/Smarty.class.php
View File

@@ -108,7 +108,7 @@ class Smarty extends Smarty_Internal_TemplateBase
/** /**
* smarty version * smarty version
*/ */
const SMARTY_VERSION = '3.1.32-dev-20'; const SMARTY_VERSION = '3.1.32-dev-21';
/** /**
* define variable scopes * define variable scopes
@@ -1213,7 +1213,7 @@ class Smarty extends Smarty_Internal_TemplateBase
$nds = $this->ds == '/' ? '\\' : '/'; $nds = $this->ds == '/' ? '\\' : '/';
// normalize $this->ds // normalize $this->ds
$path = str_replace($nds, $this->ds, $path); $path = str_replace($nds, $this->ds, $path);
preg_match('%^(?<root>(?:[[:alpha:]]:[\\\\]|/|[\\\\]{2}[[:alpha:]]+|[[:print:]]{2,}:[/]{2}|[\\\\])?)(?<path>(?:[[:print:]]*))$%', preg_match('%^(?<root>(?:[[:alpha:]]:[\\\\]|/|[\\\\]{2}[[:alpha:]]+|[[:print:]]{2,}:[/]{2}|[\\\\])?)(?<path>(.*))$%u',
$path, $parts); $path, $parts);
$path = $parts[ 'path' ]; $path = $parts[ 'path' ];
if ($parts[ 'root' ] == '\\') { if ($parts[ 'root' ] == '\\') {
@@ -1224,10 +1224,10 @@ class Smarty extends Smarty_Internal_TemplateBase
} }
} }
// remove noop 'DIRECTORY_SEPARATOR DIRECTORY_SEPARATOR' and 'DIRECTORY_SEPARATOR.DIRECTORY_SEPARATOR' patterns // remove noop 'DIRECTORY_SEPARATOR DIRECTORY_SEPARATOR' and 'DIRECTORY_SEPARATOR.DIRECTORY_SEPARATOR' patterns
$path = preg_replace('#([\\\\/]([.]?[\\\\/])+)#', $this->ds, $path); $path = preg_replace('#([\\\\/]([.]?[\\\\/])+)#u', $this->ds, $path);
// resolve '..DIRECTORY_SEPARATOR' pattern, smallest first // resolve '..DIRECTORY_SEPARATOR' pattern, smallest first
if (strpos($path, '..' . $this->ds) != false && if (strpos($path, '..' . $this->ds) != false &&
preg_match_all('#(([.]?[\\\\/])*([.][.])[\\\\/]([.]?[\\\\/])*)+#', $path, $match) preg_match_all('#(([.]?[\\\\/])*([.][.])[\\\\/]([.]?[\\\\/])*)+#u', $path, $match)
) { ) {
$counts = array(); $counts = array();
foreach ($match[ 0 ] as $m) { foreach ($match[ 0 ] as $m) {
@@ -1236,7 +1236,7 @@ class Smarty extends Smarty_Internal_TemplateBase
sort($counts); sort($counts);
foreach ($counts as $count) { foreach ($counts as $count) {
$path = preg_replace('#(([\\\\/]([.]?[\\\\/])*[^\\\\/.]+){' . $count . $path = preg_replace('#(([\\\\/]([.]?[\\\\/])*[^\\\\/.]+){' . $count .
'}[\\\\/]([.]?[\\\\/])*([.][.][\\\\/]([.]?[\\\\/])*){' . $count . '})(?=[^.])#', '}[\\\\/]([.]?[\\\\/])*([.][.][\\\\/]([.]?[\\\\/])*){' . $count . '})(?=[^.])#u',
$this->ds, $path); $this->ds, $path);
} }
} }