From: Derick Rethans <github@derickrethans.nl>
Date: Thu, 30 Jun 2011 10:26:25 +0000 (+0100)
Subject: Fixed logic and implemented normal array key return.
X-Git-Url: http://git.silmor.de/gitweb/?a=commitdiff_plain;h=3da24d9fda80bd2c3e8a36ea5498fa1fd1c1fa74;p=web%2Fkonrad%2Ftwig.git

Fixed logic and implemented normal array key return.
---

diff --git a/twig.c b/twig.c
index f365ab7..21d8ec8 100644
--- a/twig.c
+++ b/twig.c
@@ -397,15 +397,18 @@ PHP_FUNCTION(twig_template_get_attributes)
 			return $object[$item];
 		}
 */
-	if (strcmp("method", type) == 0) {
+	if (strcmp("method", type) != 0) {
 		if ((TWIG_ARRAY_KEY_EXISTS(object, item))
 			|| (TWIG_INSTANCE_OF(object, zend_ce_arrayaccess) && TWIG_ISSET_ARRAY_ELEMENT(object, item))
 		) {
+			zval *ret;
+
 			if (isDefinedTest) {
 				RETURN_TRUE;
 			}
 
-			TWIG_RETURN_ARRAY_ELEMENT(object, item);
+			ret = TWIG_RETURN_ARRAY_ELEMENT(object, item);
+			RETURN_ZVAL(ret, 0, 1);
 		}
 /*
 		if (Twig_TemplateInterface::ARRAY_CALL === $type) {