diff --git a/change_log.txt b/change_log.txt index 86deb7f0..cd854750 100644 --- a/change_log.txt +++ b/change_log.txt @@ -1,6 +1,10 @@ ===== trunk ===== +12.7.2013 +- bugfix Do not remove '//' from file path at normalization (Issue 142) + 2.7.2013 - bugfix trimwhitespace would replace captured items in wrong order (forum topic 24387) + ===== Smarty-3.1.14 ===== 27.06.2013 - bugfix removed PHP 5.5 deprecated preg_replace /e option in modifier capitalize (forum topic 24389) diff --git a/libs/sysplugins/smarty_resource.php b/libs/sysplugins/smarty_resource.php index 0a563dfc..0a5efdbc 100644 --- a/libs/sysplugins/smarty_resource.php +++ b/libs/sysplugins/smarty_resource.php @@ -162,7 +162,7 @@ abstract class Smarty_Resource { $offset = 0; // resolve simples - $_path = preg_replace('#(/\./(\./)*)|/{2,}#', '/', $_path); + $_path = preg_replace('#/\./(\./)*#', '/', $_path); // resolve parents while (true) { $_parent = strpos($_path, '/../', $offset);