- bugfix templates filepath with multibyte characters did not work

#385
smarty-php · Aug 26, 2017 · 94c2ab7 · 94c2ab7
1 parent f90b449
commit 94c2ab7
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/change_log.txt b/change_log.txt
@@ -2,6 +2,8 @@
 26.8.2017
   - bugfix chained modifier failed when last modifier parameter is a signed value
     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
   - improvement repeated delimiter like {{ and }} will be treated as literal

diff --git a/libs/Smarty.class.php b/libs/Smarty.class.php
@@ -108,7 +108,7 @@ class Smarty extends Smarty_Internal_TemplateBase
     /**
      * smarty version
      */
-    const SMARTY_VERSION = '3.1.32-dev-20';
+    const SMARTY_VERSION = '3.1.32-dev-21';
 
     /**
      * define variable scopes
@@ -1213,7 +1213,7 @@ public function _realpath($path, $realpath = null)
         $nds = $this->ds == '/' ? '\\' : '/';
         // normalize $this->ds
         $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' ];
         if ($parts[ 'root' ] == '\\') {
@@ -1224,10 +1224,10 @@ public function _realpath($path, $realpath = null)
             }
         }
         // 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
         if (strpos($path, '..' . $this->ds) != false &&
-            preg_match_all('#(([.]?[\\\\/])*([.][.])[\\\\/]([.]?[\\\\/])*)+#', $path, $match)
+            preg_match_all('#(([.]?[\\\\/])*([.][.])[\\\\/]([.]?[\\\\/])*)+#u', $path, $match)
         ) {
             $counts = array();
             foreach ($match[ 0 ] as $m) {
@@ -1236,7 +1236,7 @@ public function _realpath($path, $realpath = null)
             sort($counts);
             foreach ($counts as $count) {
                 $path = preg_replace('#(([\\\\/]([.]?[\\\\/])*[^\\\\/.]+){' . $count .
-                                     '}[\\\\/]([.]?[\\\\/])*([.][.][\\\\/]([.]?[\\\\/])*){' . $count . '})(?=[^.])#',
+                                     '}[\\\\/]([.]?[\\\\/])*([.][.][\\\\/]([.]?[\\\\/])*){' . $count . '})(?=[^.])#u',
                                      $this->ds, $path);
             }
         }