From 9c48084f3b5064d580a5c88a6fe9170599cf8879 Mon Sep 17 00:00:00 2001
From: Michael Foster <savetheinternet@tinyboard.org>
Date: Thu, 19 Sep 2013 16:08:25 +1000
Subject: upgrade twig library

---
 inc/lib/Twig/Extension/StringLoader.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
 mode change 100644 => 100755 inc/lib/Twig/Extension/StringLoader.php

(limited to 'inc/lib/Twig/Extension/StringLoader.php')

diff --git a/inc/lib/Twig/Extension/StringLoader.php b/inc/lib/Twig/Extension/StringLoader.php
old mode 100644
new mode 100755
index 20f3f994..5e1a60d0
--- 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);
 
-- 
cgit v1.3