cvs: php4 /ext/standard var.c

stas Wed Jul 11 07:45:08 2001 EDT Modified files: /php4/ext/standard var.c Log: More correct pseudo-fix # This is not really a fix. This thing is still broken. I will think on # how to really fix it. Any suggestion is *welcome*. Index: php4/ext/standard/var.c diff -u php4/ext/standard/var.c:1.93 php4/ext/standard/var.c:1.94 --- php4/ext/standard/var.c:1.93 Wed Jul 11 01:57:18 2001 +++ php4/ext/standard/var.c Wed Jul 11 07:45:05 2001 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: var.c,v 1.93 2001/07/11 05:57:18 shane Exp $ */ +/* $Id: var.c,v 1.94 2001/07/11 11:45:05 stas Exp $ */ /* {{{ includes @@ -324,7 +324,7 @@ if ((i = zend_hash_get_current_key_ex(myht, &key, NULL, &index, 0, &pos)) == HASH_KEY_NON_EXISTANT) { break; } - if (zend_hash_get_current_data_ex(myht, (void **) (&data), &pos) != SUCCESS || !data /* || ((*data) == (*struc)) */) { + if (zend_hash_get_current_data_ex(myht, (void **) (&data), &pos) != SUCCESS || !data || data == struc) { continue; } @@ -342,7 +342,6 @@ FREE_ZVAL(d); break; } - if (data == struc) return; php_var_serialize(buf, data, var_hash); } }