geckon01/Twig
1
0
Fork 0
mirror of https://github.com/twigphp/Twig.git synced 2026-09-15 20:06:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed getContext() and getAttribute() when a property value exist but is null (closes #67)

Browse Source
This commit is contained in:
Fabien Potencier
2010-06-12 13:01:26 +02:00
parent a8031fc96a
commit cc37d83b21
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/Twig/Resource.php
+3 -3
View File
@@ -26,7 +26,7 @@ abstract class Twig_Resource
protected function getContext($context, $item)
{
if (isset($context[$item])) {
if (array_key_exists($item, $context)) {
return $context[$item];
}
@@ -34,7 +34,7 @@ abstract class Twig_Resource
return null;
}
throw new InvalidArgumentException(sprintf('Item "%s" from context does not exist.', $item));
throw new InvalidArgumentException(sprintf('Variable "%s" does not exist.', $item));
}
protected function getAttribute($object, $item, array $arguments = array(), $type = Twig_Node_Expression_GetAttr::TYPE_ANY)
@@ -64,7 +64,7 @@ abstract class Twig_Resource
// object property
if (Twig_Node_Expression_GetAttr::TYPE_METHOD !== $type) {
if (isset($object->$item)) {
if (property_exists($object, $item)) {
if ($this->env->hasExtension('sandbox')) {
$this->env->getExtension('sandbox')->checkPropertyAllowed($object, $item);
}