[PHP-CVS] cvs: php-src /ext/standard array.c /ext/standard/tests/array bug34934.phpt

[Dmitry Stogov]

dmitry          Mon Oct 24 03:01:44 2005 EDT

  Removed files:               
    /php-src/ext/standard/tests/array   bug34934.phpt 

  Modified files:              
    /php-src/ext/standard       array.c 
  Log:
  Reverted fix for bug #34934. The bug marked as bogus.
  
  
http://cvs.php.net/diff.php/php-src/ext/standard/array.c?r1=1.329&r2=1.330&ty=u
Index: php-src/ext/standard/array.c
diff -u php-src/ext/standard/array.c:1.329 php-src/ext/standard/array.c:1.330
--- php-src/ext/standard/array.c:1.329  Fri Oct 21 11:54:46 2005
+++ php-src/ext/standard/array.c        Mon Oct 24 03:01:42 2005
@@ -21,7 +21,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: array.c,v 1.329 2005/10/21 15:54:46 tony2001 Exp $ */
+/* $Id: array.c,v 1.330 2005/10/24 07:01:42 dmitry Exp $ */
 
 #include "php.h"
 #include "php_ini.h"
@@ -4658,17 +4658,6 @@
                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), 
U_CLASS_ENTRY(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:
                case IS_UNICODE:

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php