summaryrefslogtreecommitdiff
path: root/inc/lib/Twig/NodeVisitor
diff options
context:
space:
mode:
authorMichael Foster <savetheinternet@tinyboard.org>2013-09-19 16:08:25 +1000
committerMichael Foster <savetheinternet@tinyboard.org>2013-09-19 16:08:25 +1000
commit9c48084f3b5064d580a5c88a6fe9170599cf8879 (patch)
treecfee62fb06abbd182568efa0395be2077a021fca /inc/lib/Twig/NodeVisitor
parent01857d176a2a9a2e3816b9cbf32da0c58f6aac3d (diff)
upgrade twig library
Diffstat (limited to 'inc/lib/Twig/NodeVisitor')
-rwxr-xr-x[-rw-r--r--]inc/lib/Twig/NodeVisitor/Escaper.php0
-rwxr-xr-x[-rw-r--r--]inc/lib/Twig/NodeVisitor/Optimizer.php0
-rwxr-xr-x[-rw-r--r--]inc/lib/Twig/NodeVisitor/SafeAnalysis.php2
-rwxr-xr-x[-rw-r--r--]inc/lib/Twig/NodeVisitor/Sandbox.php0
4 files changed, 2 insertions, 0 deletions
diff --git a/inc/lib/Twig/NodeVisitor/Escaper.php b/inc/lib/Twig/NodeVisitor/Escaper.php
index cc4b3d71..cc4b3d71 100644..100755
--- a/inc/lib/Twig/NodeVisitor/Escaper.php
+++ b/inc/lib/Twig/NodeVisitor/Escaper.php
diff --git a/inc/lib/Twig/NodeVisitor/Optimizer.php b/inc/lib/Twig/NodeVisitor/Optimizer.php
index a254def7..a254def7 100644..100755
--- a/inc/lib/Twig/NodeVisitor/Optimizer.php
+++ b/inc/lib/Twig/NodeVisitor/Optimizer.php
diff --git a/inc/lib/Twig/NodeVisitor/SafeAnalysis.php b/inc/lib/Twig/NodeVisitor/SafeAnalysis.php
index c4bbd812..b0c658cd 100644..100755
--- a/inc/lib/Twig/NodeVisitor/SafeAnalysis.php
+++ b/inc/lib/Twig/NodeVisitor/SafeAnalysis.php
@@ -89,6 +89,8 @@ class Twig_NodeVisitor_SafeAnalysis implements Twig_NodeVisitorInterface
} else {
$this->setSafe($node, array());
}
+ } elseif ($node instanceof Twig_Node_Expression_MacroCall) {
+ $this->setSafe($node, array('all'));
} elseif ($node instanceof Twig_Node_Expression_GetAttr && $node->getNode('node') instanceof Twig_Node_Expression_Name) {
$name = $node->getNode('node')->getAttribute('name');
// attributes on template instances are safe
diff --git a/inc/lib/Twig/NodeVisitor/Sandbox.php b/inc/lib/Twig/NodeVisitor/Sandbox.php
index fb27045b..fb27045b 100644..100755
--- a/inc/lib/Twig/NodeVisitor/Sandbox.php
+++ b/inc/lib/Twig/NodeVisitor/Sandbox.php