Added the Search API Synonym module to deal specifically with licence and license...

[yaffs-website] / vendor / twig / twig / lib / Twig / Template.php

diff --git a/vendor/twig/twig/lib/Twig/Template.php b/vendor/twig/twig/lib/Twig/Template.php
index f1855f1173f96242ef5844f08a5ebb4c0e0c07f7..3709232afb70b1d5c4f16be67f1557c3dadc76c9 100644 (file)
--- a/vendor/twig/twig/lib/Twig/Template.php
+++ b/vendor/twig/twig/lib/Twig/Template.php
@@ -568,6 +568,8 @@ abstract class Twig_Template implements Twig_TemplateInterface
 
             if (null === $object) {
                 $message = sprintf('Impossible to invoke a method ("%s") on a null variable.', $item);
+            } elseif (is_array($object)) {
+                $message = sprintf('Impossible to invoke a method ("%s") on an array.', $item);
             } else {
                 $message = sprintf('Impossible to invoke a method ("%s") on a %s variable ("%s").', $item, gettype($object), $object);
             }
@@ -627,11 +629,14 @@ abstract class Twig_Template implements Twig_TemplateInterface
                     continue;
                 }
 
-                if (!isset($cache[$name])) {
-                    $cache[$name] = $method;
-                }
-                if (!isset($cache[$lcName])) {
-                    $cache[$lcName] = $method;
+                // skip get() and is() methods (in which case, $name is empty)
+                if ($name) {
+                    if (!isset($cache[$name])) {
+                        $cache[$name] = $method;
+                    }
+                    if (!isset($cache[$lcName])) {
+                        $cache[$lcName] = $method;
+                    }
                 }
             }
             self::$cache[$class] = $cache;
@@ -693,9 +698,11 @@ abstract class Twig_Template implements Twig_TemplateInterface
             }
             @trigger_error($message, E_USER_DEPRECATED);
 
-            return $ret === '' ? '' : new Twig_Markup($ret, $this->env->getCharset());
+            return '' === $ret ? '' : new Twig_Markup($ret, $this->env->getCharset());
         }
 
         return $ret;
     }
 }
+
+class_alias('Twig_Template', 'Twig\Template', false);