Security update to Drupal 8.4.6

[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 64563419ec0c17b9c2694ac05aba12c3a8b6bf9c..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);
             }
@@ -696,7 +698,7 @@ 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;