summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoruwetews <uwe.tews@googlemail.com>2016-09-28 04:59:51 +0200
committeruwetews <uwe.tews@googlemail.com>2016-09-28 04:59:51 +0200
commit998c7789485e89f401d2cae4af3fda91a8a03956 (patch)
tree88a14ac517b1c8f3718079bf06cede68fbc4c995
parent3f0d519daf26c4937b132845e5b1c1f97e410a38 (diff)
downloadsmarty-998c7789485e89f401d2cae4af3fda91a8a03956.tar.gz
smarty-998c7789485e89f401d2cae4af3fda91a8a03956.tar.bz2
smarty-998c7789485e89f401d2cae4af3fda91a8a03956.zip
- bugfix the generated code for calling a subtemplate must pass the template resource name in single quotes https://github.com/smarty-php/smarty/issues/299
-rw-r--r--change_log.txt5
-rw-r--r--libs/Smarty.class.php2
-rw-r--r--libs/sysplugins/smarty_internal_compile_include.php2
3 files changed, 6 insertions, 3 deletions
diff --git a/change_log.txt b/change_log.txt
index 7137e427..b7e063d3 100644
--- a/change_log.txt
+++ b/change_log.txt
@@ -1,8 +1,11 @@
===== 3.1.31-dev ===== (xx.xx.xx)
+ 28.09.2016
+ - bugfix the generated code for calling a subtemplate must pass the template resource name in single quotes https://github.com/smarty-php/smarty/issues/299
+
27.09.2016
- bugfix when Smarty does use an internally cached template object on Smarty::fetch() calls
the template and config variables must be cleared https://github.com/smarty-php/smarty/issues/297
-
+
20.09.2016
- bugfix some $smarty special template variables are no longer accessed as real variable.
using them on calls like {if isset($smarty.foo)} or {if empty($smarty.foo)} will fail
diff --git a/libs/Smarty.class.php b/libs/Smarty.class.php
index 21015fc8..a93d52c6 100644
--- a/libs/Smarty.class.php
+++ b/libs/Smarty.class.php
@@ -114,7 +114,7 @@ class Smarty extends Smarty_Internal_TemplateBase
/**
* smarty version
*/
- const SMARTY_VERSION = '3.1.31-dev/30';
+ const SMARTY_VERSION = '3.1.31-dev/31';
/**
* define variable scopes
diff --git a/libs/sysplugins/smarty_internal_compile_include.php b/libs/sysplugins/smarty_internal_compile_include.php
index 3c840e67..9751e517 100644
--- a/libs/sysplugins/smarty_internal_compile_include.php
+++ b/libs/sysplugins/smarty_internal_compile_include.php
@@ -107,7 +107,7 @@ class Smarty_Internal_Compile_Include extends Smarty_Internal_CompileBase
$compiled->includes[ $fullResourceName ] = 1;
}
}
- $fullResourceName = '"' . $fullResourceName . '"';
+ $fullResourceName = "'" . $fullResourceName . "'";
}
}
if (empty($match[ 5 ])) {