From f9fb94ff00e5334f07a31ecfcffaf845fd54b3c8 Mon Sep 17 00:00:00 2001
From: Dmitry Stogov <dmitry@php.net>
Date: Mon, 24 Oct 2005 06:58:42 +0000
Subject: [PATCH] Reverted patch for bug #34934. Bug is marked as bogus.

---
 NEWS                                   |  1 -
 ext/standard/array.c                   | 11 -----------
 ext/standard/tests/array/bug34934.phpt | 18 ------------------
 3 files changed, 30 deletions(-)
 delete mode 100755 ext/standard/tests/array/bug34934.phpt

diff --git a/NEWS b/NEWS
index 3f140d2e68..8228c9300e 100644
--- a/NEWS
+++ b/NEWS
@@ -5,7 +5,6 @@ PHP                                                                        NEWS
 - Fixed bug #34957 (PHP doesn't respect ACLs for access checks). (Wez)
 - Fixed bug #34938 (dns_get_record() doesn't resolve long hostnames and 
   leaks). (Tony)
-- Fixed bug #34934 (offsetExists is not called from array_key_exists). (Dmitry)
 - Fixed bug #34905 (Digest authentication does not work with Apache 1). (Ilia)
 - Fixed bug #34902 (mysqli::character_set_name() - undefined method). (Tony)
 - Fixed bug #34893 (PHP5.1 overloading, Cannot access private property).
diff --git a/ext/standard/array.c b/ext/standard/array.c
index 2e281f765f..fd9f2af36f 100644
--- a/ext/standard/array.c
+++ b/ext/standard/array.c
@@ -4390,17 +4390,6 @@ PHP_FUNCTION(array_key_exists)
 		RETURN_FALSE;
 	}
 
-	if (Z_TYPE_PP(array) == IS_OBJECT &&
-	    Z_OBJ_HT_PP(array)->has_dimension &&
-	    (Z_OBJ_HT_PP(array)->has_dimension != std_object_handlers.has_dimension ||
-	     instanceof_function_ex(Z_OBJCE_PP(array), zend_ce_arrayaccess, 1 TSRMLS_CC))) {
-		if (Z_OBJ_HT_PP(array)->has_dimension(*array, *key, 0 TSRMLS_CC)) {
-			RETURN_TRUE;
-		} else {
-			RETURN_FALSE;
-		}
-	}
-
 	switch (Z_TYPE_PP(key)) {
 		case IS_STRING:
 			if (zend_symtable_exists(HASH_OF(*array), Z_STRVAL_PP(key), Z_STRLEN_PP(key)+1)) {
diff --git a/ext/standard/tests/array/bug34934.phpt b/ext/standard/tests/array/bug34934.phpt
deleted file mode 100755
index 1f5d161f30..0000000000
--- a/ext/standard/tests/array/bug34934.phpt
+++ /dev/null
@@ -1,18 +0,0 @@
---TEST--
-Bug #34934 (offsetExists is not called from array_key_exists)
---FILE--
-<?php
-class MyArray extends ArrayObject {
-  function offsetExists($mKey) { 
-  	echo __METHOD__ . "($mKey)\n";
-  	return true;
-  }
-}
-
-$a = new MyArray();
-
-var_dump(array_key_exists("test", $a));
-?>
---EXPECT--
-MyArray::offsetExists(test)
-bool(true)
-- 
2.50.1