diff options
author | Zeev Suraski <zeev@php.net> | 1999-09-03 01:34:52 +0000 |
---|---|---|
committer | Zeev Suraski <zeev@php.net> | 1999-09-03 01:34:52 +0000 |
commit | 69fa5199bc3b942531a1d2685a29d8acb150e688 (patch) | |
tree | 2b0cba4d45d4ce1801935005f2a5e25c0763d841 /Zend/zend_variables.c | |
parent | 2521b5550ab059f3033c7fef1359a460f66cd9c2 (diff) | |
download | php-git-69fa5199bc3b942531a1d2685a29d8acb150e688.tar.gz |
Let $GLOBALS actually work...
Diffstat (limited to 'Zend/zend_variables.c')
-rw-r--r-- | Zend/zend_variables.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Zend/zend_variables.c b/Zend/zend_variables.c index ca81494d25..da3fedb505 100644 --- a/Zend/zend_variables.c +++ b/Zend/zend_variables.c @@ -124,9 +124,11 @@ ZEND_API int _zval_copy_ctor(zval *zvalue ZEND_FILE_LINE_DC) HashTable *original_ht = zvalue->value.ht; ELS_FETCH(); - if (!zvalue->value.ht || zvalue->value.ht==&EG(symbol_table)) { + if (!zvalue->value.ht) { var_reset(zvalue); return FAILURE; + } else if (zvalue->value.ht==&EG(symbol_table)) { + return SUCCESS; /* do nothing */ } zvalue->value.ht = (HashTable *) emalloc_rel(sizeof(HashTable)); zend_hash_init(zvalue->value.ht, 0, NULL, PVAL_PTR_DTOR, 0); |