upgrade twig library

17 files changed, 1 insertions, 1 deletions

diff --git a/inc/lib/Twig/TokenParser/AutoEscape.php b/inc/lib/Twig/TokenParser/AutoEscape.php
index 27560288..27560288 100644..100755
--- a/inc/lib/Twig/TokenParser/AutoEscape.php
+++ b/inc/lib/Twig/TokenParser/AutoEscape.php
diff --git a/inc/lib/Twig/TokenParser/Block.php b/inc/lib/Twig/TokenParser/Block.php
index a2e017f3..a2e017f3 100644..100755
--- a/inc/lib/Twig/TokenParser/Block.php
+++ b/inc/lib/Twig/TokenParser/Block.php
diff --git a/inc/lib/Twig/TokenParser/Do.php b/inc/lib/Twig/TokenParser/Do.php
index f50939dd..f50939dd 100644..100755
--- a/inc/lib/Twig/TokenParser/Do.php
+++ b/inc/lib/Twig/TokenParser/Do.php
diff --git a/inc/lib/Twig/TokenParser/Embed.php b/inc/lib/Twig/TokenParser/Embed.php
index 69cb5f35..69cb5f35 100644..100755
--- a/inc/lib/Twig/TokenParser/Embed.php
+++ b/inc/lib/Twig/TokenParser/Embed.php
diff --git a/inc/lib/Twig/TokenParser/Extends.php b/inc/lib/Twig/TokenParser/Extends.php
index f5ecee21..f5ecee21 100644..100755
--- a/inc/lib/Twig/TokenParser/Extends.php
+++ b/inc/lib/Twig/TokenParser/Extends.php
diff --git a/inc/lib/Twig/TokenParser/Filter.php b/inc/lib/Twig/TokenParser/Filter.php
index 2b97475a..2b97475a 100644..100755
--- a/inc/lib/Twig/TokenParser/Filter.php
+++ b/inc/lib/Twig/TokenParser/Filter.php
diff --git a/inc/lib/Twig/TokenParser/Flush.php b/inc/lib/Twig/TokenParser/Flush.php
index 4e15e785..4e15e785 100644..100755
--- a/inc/lib/Twig/TokenParser/Flush.php
+++ b/inc/lib/Twig/TokenParser/Flush.php
diff --git a/inc/lib/Twig/TokenParser/For.php b/inc/lib/Twig/TokenParser/For.php
index 98a6d079..98a6d079 100644..100755
--- a/inc/lib/Twig/TokenParser/For.php
+++ b/inc/lib/Twig/TokenParser/For.php
diff --git a/inc/lib/Twig/TokenParser/From.php b/inc/lib/Twig/TokenParser/From.php
index a54054db..ff6e5756 100644..100755
--- a/inc/lib/Twig/TokenParser/From.php
+++ b/inc/lib/Twig/TokenParser/From.php
@@ -56,7 +56,7 @@ class Twig_TokenParser_From extends Twig_TokenParser
         $node = new Twig_Node_Import($macro, new Twig_Node_Expression_AssignName($this->parser->getVarName(), $token->getLine()), $token->getLine(), $this->getTag());
 
         foreach ($targets as $name => $alias) {
-            $this->parser->addImportedSymbol('function', $alias, 'get'.$name, $node->getNode('var'));
+            $this->parser->addImportedSymbol('macro', $alias, $name, $node->getNode('var'));
         }
 
         return $node;
diff --git a/inc/lib/Twig/TokenParser/If.php b/inc/lib/Twig/TokenParser/If.php
index 3d7d1f51..3d7d1f51 100644..100755
--- a/inc/lib/Twig/TokenParser/If.php
+++ b/inc/lib/Twig/TokenParser/If.php
diff --git a/inc/lib/Twig/TokenParser/Import.php b/inc/lib/Twig/TokenParser/Import.php
index e7050c70..e7050c70 100644..100755
--- a/inc/lib/Twig/TokenParser/Import.php
+++ b/inc/lib/Twig/TokenParser/Import.php
diff --git a/inc/lib/Twig/TokenParser/Include.php b/inc/lib/Twig/TokenParser/Include.php
index 4a317868..4a317868 100644..100755
--- a/inc/lib/Twig/TokenParser/Include.php
+++ b/inc/lib/Twig/TokenParser/Include.php
diff --git a/inc/lib/Twig/TokenParser/Macro.php b/inc/lib/Twig/TokenParser/Macro.php
index 82b4fa6d..82b4fa6d 100644..100755
--- a/inc/lib/Twig/TokenParser/Macro.php
+++ b/inc/lib/Twig/TokenParser/Macro.php
diff --git a/inc/lib/Twig/TokenParser/Sandbox.php b/inc/lib/Twig/TokenParser/Sandbox.php
index 9457325a..9457325a 100644..100755
--- a/inc/lib/Twig/TokenParser/Sandbox.php
+++ b/inc/lib/Twig/TokenParser/Sandbox.php
diff --git a/inc/lib/Twig/TokenParser/Set.php b/inc/lib/Twig/TokenParser/Set.php
index 70e0b41b..70e0b41b 100644..100755
--- a/inc/lib/Twig/TokenParser/Set.php
+++ b/inc/lib/Twig/TokenParser/Set.php
diff --git a/inc/lib/Twig/TokenParser/Spaceless.php b/inc/lib/Twig/TokenParser/Spaceless.php
index 1e3fa8f3..1e3fa8f3 100644..100755
--- a/inc/lib/Twig/TokenParser/Spaceless.php
+++ b/inc/lib/Twig/TokenParser/Spaceless.php
diff --git a/inc/lib/Twig/TokenParser/Use.php b/inc/lib/Twig/TokenParser/Use.php
index bc0e09ef..bc0e09ef 100644..100755
--- a/inc/lib/Twig/TokenParser/Use.php
+++ b/inc/lib/Twig/TokenParser/Use.php