- bugfix add addition check for OS type on normalization of file path #…

…134
smarty-php · Dec 20, 2015 · 78243be · 78243be
1 parent 6483164
commit 78243be
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/change_log.txt b/change_log.txt
@@ -2,6 +2,7 @@
  20.12.2015
   - bugfix failure when the default resource type was set to 'extendsall' https://github.com/smarty-php/smarty/issues/123
   - update compilation of Smarty special variables
+  - bugfix add addition check for OS type on normalizaition of file path https://github.com/smarty-php/smarty/issues/134
 
  19.12.2015
   - bugfix using $smarty.capture.foo in expressions could fail https://github.com/smarty-php/smarty/pull/138

diff --git a/libs/Smarty.class.php b/libs/Smarty.class.php
@@ -118,7 +118,7 @@ class Smarty extends Smarty_Internal_TemplateBase
     /**
      * smarty version
      */
-    const SMARTY_VERSION = '3.1.29-dev/15';
+    const SMARTY_VERSION = '3.1.29-dev/16';
 
     /**
      * define variable scopes
@@ -1178,7 +1178,7 @@ public function _realpath($path, $realpath = null)
             $path = str_replace($nds, DS, $path);
         }
 
-        if ($realpath === true && $path[0] !== '/' && $path[1] !== ':') {
+        if ($realpath === true && (($path[0] !== '/' && DS == '/') || ($path[1] !== ':' && DS != '/'))) {
             $path = getcwd() . DS . $path;
         }
         while ((strpos($path, '.' . DS) !== false) || (strpos($path, DS . DS) !== false)) {