diff options
| author | Michael Foster <savetheinternet@tinyboard.org> | 2013-09-19 16:08:25 +1000 |
|---|---|---|
| committer | Michael Foster <savetheinternet@tinyboard.org> | 2013-09-19 16:08:25 +1000 |
| commit | 9c48084f3b5064d580a5c88a6fe9170599cf8879 (patch) | |
| tree | cfee62fb06abbd182568efa0395be2077a021fca /inc/lib/Twig/Extension/StringLoader.php | |
| parent | 01857d176a2a9a2e3816b9cbf32da0c58f6aac3d (diff) | |
upgrade twig library
Diffstat (limited to 'inc/lib/Twig/Extension/StringLoader.php')
| -rwxr-xr-x[-rw-r--r--] | inc/lib/Twig/Extension/StringLoader.php | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/inc/lib/Twig/Extension/StringLoader.php b/inc/lib/Twig/Extension/StringLoader.php index 20f3f994..5e1a60d0 100644..100755 --- a/inc/lib/Twig/Extension/StringLoader.php +++ b/inc/lib/Twig/Extension/StringLoader.php @@ -43,16 +43,16 @@ class Twig_Extension_StringLoader extends Twig_Extension */ function twig_template_from_string(Twig_Environment $env, $template) { - static $loader; + $name = sprintf('__string_template__%s', hash('sha256', uniqid(mt_rand(), true), false)); - if (null === $loader) { - $loader = new Twig_Loader_String(); - } + $loader = new Twig_Loader_Chain(array( + new Twig_Loader_Array(array($name => $template)), + $current = $env->getLoader(), + )); - $current = $env->getLoader(); $env->setLoader($loader); try { - $template = $env->loadTemplate($template); + $template = $env->loadTemplate($name); } catch (Exception $e) { $env->setLoader($current); |
